[8/9] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: start/src/test/java/org/apache/accumulo/start/classloader/vfs/providers/VfsClassLoaderTest.java start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java Project: http://git-wip-us.apache.org/repos/asf/accumulo

[8/9] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3875de36 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3875de36 Diff: http://git-wip-us.apache.org/repos/asf/