ACCUMULO-3182 Attempt to fix bad merge
Merge remote-tracking branch 'origin/master' into ACCUMULO-2589