Reverted merge of sam_debind into next.
Merge branch 'next' into sam_97

Conflicts:
	src/clustering/administration/main/file_based_svs_by_namespace.cc
	src/clustering/administration/reactor_driver.tcc
	src/clustering/reactor/reactor_be_secondary.cc
	src/memcached/protocol.cc