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

Conflicts:
	extra/rpm/tarantool-scl.rpm.spec

Conflicts:
	src/box/box.cc
	src/box/replica.cc
	src/iproto_constants.cc

Conflicts:
	src/box/replication.cc

Conflicts:
	src/lua/yaml.cc

Conflicts:
	src/box/box.cc
	src/box/replica.cc
	src/box/replication.cc
	test/unit/CMakeLists.txt

Make the new tests more stable.
Add a logger output, so that log is output to a file rather than terminal.
Make require_mod module test more robust.

Conflicts:
	debian/control
	debian/tarantool-lts-client.install
	debian/tarantool-lts-client.manpages
	debian/tarantool-lts-dev.install
	debian/tarantool-lts-modules.install
	debian/tarantool-lts-sophia-module.install
	debian/tarantool-modules.install
	debian/tarantool-sql-module.install

iproto_header_encode() already uses gc memory, use it for
fixed row header as well.

Use underscores instead of dashes in file names.
Use 0 for success -1 for error.

Update code and tests.

With snapshot recovery, we have 3 different states of
replication:
- no replication at all
- there is a replication source, but no connection to the
master
- connecte to master and reading snapshot/xlog

This is a preparatory step to (in future) separate
setting of replication source and establishing a connection
to the master.

Conflicts:
	extra/rpm.spec.in
	extra/rpm/tarantool.rpm.spec.in
	test/CMakeLists.txt