Merge branch 'stable'

Conflicts:
	.gitmodules
	CMakeLists.txt
	extra/rpm.spec.in
	src/CMakeLists.txt
	src/box/box.cc
	src/box/box.h
	src/log_io.cc
	src/recovery.cc
	src/tarantool.cc
	test/unit/CMakeLists.txt
	test/unit/test.c