ACCUMULO-3048 More CHANGES