ACCUMULO-3212 Fix hadoop-1 support.
Merge branch '1.6'