Fixed move-master-failure tests; Added more rangeserver-failover-basic instrumentation