ACCUMULO-1458 - cleaning up warning in code
Merge branch '1.6.0-SNAPSHOT'