ensure a node sleeps a lease period on startup if another node was previously the master
(this backports some changes from the 1.7 branch)
simple throttling scheme for head copying
Merge pull request #483 from Incubaid/ARA-64

ensure a node sleeps a lease period on startup if another node was previ...
the start of a masterlease for a node should be as conservative as
possible on the node which the masterset is about
(this fixes yet another multiple masters issue)
Merge branch 'incubaid-1.6' into 1.6-for-1.7

Conflicts:
	src/node/dump_store.ml
	src/node/store.ml
	src/node/sync_backend.ml
	src/paxos/master.ml
	src/paxos/multi_paxos.ml
	src/paxos/multi_paxos_fsm.ml
	src/paxos/slave.ml
	src/paxos/value.ml
	src/system/startup.ml
	src/tlog/tlc2_test.ml
	src/tlog/tlogcollection_test.ml
	src/tlog/update.ml
fill masterset value too in epilogue of catchup
fuse state machine to separate test outputs
fuse count thread
run test drop_master_while_maintenance on another port to avoid EADDRINUSE
handle review comments
Merge branch 'incubaid-1.6' into incubaid-throttling_copy

Conflicts:
	src/node/dump_store.ml
Merge pull request #482 from Incubaid/throttling_copy

simple throttling scheme for head copying
fix off by one error in copy_db_to_head
Merge pull request #484 from Incubaid/ARA-56-bis

Ara 56 bis
Merge branch 'incubaid-1.6' into 1.6-for-1.7

Conflicts:
	cfg/arakoon.ini
	src/main/main.ml
	src/main/replay_main.ml
	src/node/catchup.ml
	src/node/collapser.ml
	src/node/collapser_test.ml
	src/node/dump_store.ml
	src/node/mem_store.ml
	src/node/node_cfg.ml
	src/node/node_main.ml
	src/node/store.ml
	src/node/sync_backend.ml
	src/paxos/master.ml
	src/paxos/multi_paxos_fsm.ml
	src/paxos/value.ml
	src/system/drop_master.ml
	src/system/single.ml
	src/system/startup.ml
	src/tlog/tlc2_test.ml
	src/tlog/tlogcollection_test.ml
	src/tools/file_system.ml
	src/tools/fsm.ml
	src/tools/ini.ml
Merge branch 'incubaid-1.7' into 1.6-for-1.7

Conflicts:
	src/node/node_main.ml
Merge pull request #491 from Incubaid/copy-db-to-head-off-by-one

fix off by one error in copy_db_to_head
Merge pull request #488 from Incubaid/1.6-for-1.7

1.6 for 1.7
fix test_marker_presence_required
Merge pull request #494 from Incubaid/test-marker-presence

fix test_marker_presence_required