removed special handling of master updates in on_accept.
master sets are followed by a paxos NOP.
on_consensus adds timestamp.
bugfix where a node can push the wrong first masterset into the store
fix concurrent collapse test
move some not so shaky tests back to other suites
Merge remote-tracking branch 'refs/remotes/origin/romain' into 1.6
Merge remote-tracking branch 'refs/remotes/origin/concurrent-collapse' into 1.6
Merge remote-tracking branch 'refs/remotes/origin/move-shakies' into 1.6