ACCUMULO-1730 Reinsert changes inadvertently lost in cherry-pick
ACCUMULO-1751 Bad merge line left in IT