ACCUMULO-2935 Add a timeout to a test that otherwise hung indefinitely
Merge branch '1.6.1-SNAPSHOT'