Conflicts:
	cmake/BuildSophia.cmake

Bring source package and revision control ignore files up to
date with the state of the master branch.

Test wasn't correctly merged from 1.5

Check for length, since otherwise the server would randomly
drop client connection once in a while.

A server could crash if some of the request fields were missing.
Check in the request parser for presence of all mandatory fields.
Add a test case from the original fir fox gh-206 by @roman

Always use IPROTO_REQUEST_TYPE to refer to the first member
of IPROTO_HEADER. Weed out 'code' as a synonym for type.

Rename iproto_packet to iproto_header. It's neither packet nor
header, but it's at least more header than it is packet.

Restore 'row' as a variable name for an instance of iproto_header
in all places where it is used as a single replication or
write ahead log row.

Conflicts:
	src/palloc.cc

Workaround for OPENTAR-77

Conflicts:
	src/lua/init.cc
	test/box/bsdsocket.result
	test/box/bsdsocket.test
	test/box/lua.result

+ fix bsdsocket test

Conflicts:
	src/CMakeLists.txt
	src/box/recovery.h
	src/box/replication.cc
	src/lua/info.cc

 + nonblock after accept
 + define SO_PROTOCOL, SO_TYPE constants for centos 5.0

 + nonblock after accept
 + define SO_PROTOCOL, SO_TYPE constants for centos 5.0