ACCUMULO-2973 increase timeout for the test
ACCUMULO-3030 allow scanners to be interrupted
ACCUMULO-3030 allow scanners to be interrupted
Merge branch '1.6.1-SNAPSHOT'