ACCUMULO-2584 use IteratorSettings to push the scan iterator, not a zookeeper setting
Merge branch '1.6.0-SNAPSHOT'