ACCUMULO-3010 cherry-picked to 1.6