ACCUMULO-1832 WIP
ACCUMULO-1832 WIP
ACCUMULO-1832 made changes based on code review
ACCUMULO-1832 fix cut and paste bug
ACCUMULO-1832 WIP
ACCUMULO-1832 WIP