HBASE-9430 Memstore heapSize calculation - DEEP_OVERHEAD is incorrect

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1524914 13f79535-47bb-0310-9956-ffa450edef68
HBASE-9244 Add CP hooks around StoreFileReader creation

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