HBASE-8931 TestTableLockManager.testTableReadLock fails

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1502382 13f79535-47bb-0310-9956-ffa450edef68
HBASE-8933 TestSplitTransactionOnCluster fails because "Region not moved off .META. server"

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1502397 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd
Merge remote branch 'origin/trunk-gd' into fb-YAHOO-325-trunk-gd