ignore all old accepts
ensure no lease is active before going to Slave_discovered_other_master
ensure no lease is active before going to Slave_fake_prepare
Merge pull request #427 from Incubaid/fix-multiple-masters

Fix multiple masters
prevent 2 nodes in wait_for_accepteds state remaining isolated (by ignoring each other)
Fix for catchup-only.
Previously when the get_db call succeeded the result of this was not
copied to head.db. This results in incomplete data on this specific
node. I removed this optimization so the node only does regular
catchup.
Merge pull request #430 from Incubaid/fix-catchup-only

Fix for catchup-only.
Merge branch 'incubaid-1.6' into 1.6-for-1.7

Conflicts:
	src/paxos/master.ml
	src/paxos/slave.ml
Merge pull request #429 from Incubaid/fix-isolation

prevent 2 nodes in wait_for_accepteds state remaining isolated (by ignor...
Merge branch 'incubaid-1.6' into 1.6-for-1.7

Conflicts:
	src/node/catchup.ml
	src/node/node_main.ml
Merge branch 'incubaid-1.6' into 1.6-for-1.7

Conflicts:
	src/paxos/multi_paxos_fsm.ml
Merge branch 'incubaid-1.7' into 1.6-for-1.7

Conflicts:
	src/node/catchup.ml
Merge pull request #433 from Incubaid/1.6-for-1.7

1.6 for 1.7