ACCUMULO-3182 Fix incorrect fix at bad merge.
Merge remote-tracking branch 'origin/master' into ACCUMULO-2589