ACCUMULO-3292 Workaround which should make the test more stable.
Merge branch '1.6'