ACCUMULO-2998 updates based on offline comments from [~kturner]