ACCUMULO-1832 require all volumes to have same instance id and version
Merge branch '1.6.0-SNAPSHOT'