Removing obsolete test.
Turning DemoteMaster into a RPC. One down, 20 to go.
Merge branch 'replication'