HBASE-12584 Fix branch-1 failing since task 5 HBASE-12404 (HBASE-12404 addendum)