ACCUMULO-1957 updates from last [~kturner] review