HBASE-9204 An Offline SplitParent Region can be assigned breaking split references

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1514747 13f79535-47bb-0310-9956-ffa450edef68
HBASE-9239 TestStoreFileBlockCacheSummary#testBlockCacheSummary occasionally fails (Ted Yu)



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