ACCUMULO-2908 use batch scanner opts when parsing
Merge branch '1.6.1-SNAPSHOT'