ACCUMULO-2930: Update classes still using AccumuloClassLoader.getClassLoader() to use AccumuloVFSClassLoader
ACCUMULO-2926 Fix the multiple slf4j bindings that ACCUMULO-2808 introduced
Merge branch '1.6.1-SNAPSHOT'