ACCUMULO-1772 updated based on code review comments