ACCUMULO-2455 1s timeout is too tight for testing
Merge branch '1.6.0-SNAPSHOT'