ACCUMULO-2531 Use VolumeConfiguration instead of instance.dfs.dir in ClientOpts

VolumeConfiguration encompasses both instance.dfs.dir and instance.volumes.
Merge branch '1.6.0-SNAPSHOT'