Merge branch 'origin-1.6' into 1.6-for-1.7 (empty changeset)
Conflicts:
	extension/test/server/quick/system_tests_basic.py
	extension/test/server/system_tests_common.py
	src/msg/tcp_messaging.ml
	src/paxos/multi_paxos.ml
	src/paxos/multi_paxos_fsm.ml
	src/paxos/slave.ml
	src/tools/network.ml
	src/tools/server.ml