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