ACCUMULO-3182 Attempt to fix bad merge