HBASE-8547. Fix java.lang.RuntimeException: Cached an already cached block (Addendum3 to remove assertion)

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