ACCUMULO-1832 added volume replacement
Merge branch '1.6.0-SNAPSHOT'