ACCUMULO-2589 Drop deprecated code from 1.x