ACCUMULO-2049 Made shell use new instance.volumes config
Merge branch '1.6.0-SNAPSHOT'