ACCUMULO-3145 Fix loop invariants in listscans

Added some extra logging and (automatically) fixed formatting.
Merge branch '1.6.1-SNAPSHOT'