Merge branch 'stable'

Conflicts:
	CMakeLists.txt
	extra/rpm.spec.in
	src/admin.cc
	src/admin.rl
	src/box/box_lua.cc
	src/box/lua/box_net.lua
	src/coio.cc
	src/lua/init.cc
	src/module/mysql/mysql.cc
	src/module/pg/pg.cc
	src/plugin.h
	test/box/admin.result
	test/box/net.box.result
	test/box/net_sql.mysql.result
	test/box/net_sql.mysql.test
	test/box/net_sql.pg.result
	test/box/net_sql.pg.test
	test/box/socket.result
	test/box/socket.test.py