ACCUMULO-1832 prep for command to re-write uris
ACCUMULO-1832 class for re-writting uris
Merge branch '1.6.0-SNAPSHOT'