ACCUMULO-2857 Messed up the merge