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