HBASE-10569 Co-locate meta and master - ADDENDUM

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1581513 13f79535-47bb-0310-9956-ffa450edef68
HBASE-10828 TestRegionObserverInterface#testHBase3583 should wait for all regions to be assigned



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