ACCUMULO-3097 Add some class-level javadoc for some iterators.

Formatter also fixed some whitespace issues.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-3098 fix timeout
ACCUMULO-3098 fix timeout
Merge branch '1.6.1-SNAPSHOT'