merge from hbase-11339-core