ACCUMULO-2405 use a simpler loop
ACCUMULO-2418 use utility method to count iterables
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2418 add fail message back
Merge branch '1.6.0-SNAPSHOT'