HBASE-9963 Fix TestHeapSize

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1542358 13f79535-47bb-0310-9956-ffa450edef68
HBASE-9971 Port part of HBASE-9958 to 0.94 - change lock scope in locateRegion (original patch by Nicolas Liochon)

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