ACCUMULO-3098 fix timeout
ACCUMULO-3098 fix timeout
Merge branch '1.6.1-SNAPSHOT'