ACCUMULO-2733 clean up one missed unused import.
Merge branch '1.6.0-SNAPSHOT'