ACCUMULO-1853 added missing test dependencies for hadoop 1 build
ACCUMULO-1853 Merge branch '1.6.0-SNAPSHOT'