ACCUMULO-3263 use volume chooser to select directory entries
ACCUMULO-3263 more cleanup
ACCUMULO-3263 merge 1.6