HBASE-11611 Addendum to fix hanging tests