ACCUMULO-3030 allow scanners to be interrupted
ACCUMULO-3180 Better test naming and some extra functionality to SlowIterator
Merge branch '1.5' into 1.6

Conflicts:
	test/src/main/java/org/apache/accumulo/test/functional/SlowIterator.java
Merge branch '1.6'