ACCUMULO-1628 Fixes issue after previous changes which interrupted a deep-copy

Pushes the interrupt flag from the SourceSwitchingIterator down to the
FileManager and InMemoryMap. This should avoid passing the interrupt
into a deep copy which isn't supported. Adds some more tests which
previously caused the edge case which is now fixed.

Signed-off-by: Josh Elser <elserj@apache.org>
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
	server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
	server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
ACCUMULO-3113 Increase the timeouts in testTimeout

Formatting also got fixed by eclipse. Should help stabilize
some failures that I was seeing from this test. It appears that
1 second was slightly too fast in some cases to get the cond mutation
committed.
Merge branch '1.6.1-SNAPSHOT'