Fix of race condition in replication/memcached.test, some code cleanup
Merge branch 'tt-mem-repl-fix' into stable
Merge remote-tracking branch 'origin/stable'

Conflicts:
	test/replication/memcached.test
	third_party/luajit