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'
ACCUMULO-3010 cherry-picked to 1.6
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
ACCUMULO-3026 UniqueFileReplicator was not being closed
ACCUMULO-3025 check for null pointer
ACCUMULO-3006 check for viewfs
Merge branch '1.6.1-SNAPSHOT'