ACCUMULO-3278 Fix mis-matched arguments in RetryFactory and add a test.
Merge branch '1.6'