HBASE-8965 TestRemoteAdmin.testClusterStatus fails

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1503999 13f79535-47bb-0310-9956-ffa450edef68
HBASE-8877 Reentrant row locks (Dave Latham)

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1504002 13f79535-47bb-0310-9956-ffa450edef68
HBASE-8957 TestDrainingServer. testDrainingServerWithAbort fails

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