HBASE-7729 TestCatalogTrackerOnCluster.testbadOriginalRootLocation fails occasionally

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1441237 13f79535-47bb-0310-9956-ffa450edef68
HBASE-7730 HBaseAdmin#synchronousBalanceSwitch is not compatible with 0.92

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1441252 13f79535-47bb-0310-9956-ffa450edef68