HBASE-12671 HBASE-12652 broke branch-1 builds (TestAssignmentManager fails)