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'