ACCUMULO-3217 Fix use of deprecated members
Merge branch '1.6'