ACCUMULO-2124 minor updates to comments
Merge branch '1.6.0-SNAPSHOT'