ACCUMULO-2475 recovery failed due to using the wrong filesystem
Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT