ACCUMULO-2680 Extend the timeout even more
Merge branch '1.6.0-SNAPSHOT'