ACCUMULO-2160 review fixes