ACCUMULO-1961 remove unused imports and variables
Merge branch '1.6.0-SNAPSHOT'