Conflicts:
	cfg/tarantool_box_cfg.c
	cfg/tarantool_box_cfg.cfg
	cfg/tarantool_box_cfg.h
	cfg/tarantool_feeder_cfg.c
	cfg/tarantool_feeder_cfg.h
	core/exception.m
	core/fiber.m
	core/log_io.m
	core/log_io_remote.m
	include/fiber.h
	mod/box/box.h
	mod/box/box.m
	mod/box/box_cfg.cfg_tmpl
	mod/box/memcached.m
	mod/box/memcached.rl
	mod/feeder/feeder.m
	test/box_replication/common.result
	test/box_replication/suite.ini
	test/lib/admin_connection.py
	test/lib/box_connection.py
	test/lib/server.py
	test/lib/sql_ast.py
	test/lib/tarantool_box_server.py
	test/lib/tarantool_connection.py
	test/lib/tarantool_feeder_server.py
	test/lib/tarantool_server.py