ACCUMULO-3263 Fix compilation issue. Method doesn't exist in 1.6
Merge branch '1.6'