ACCUMULO-3110 clean up some more timeout related issues with some problematic ITs
Merge branch '1.6.1-SNAPSHOT'