ACCUMULO-2774 Started seeing failures on BlockedIOStreamTest after the patch was applied.
Merge branch '1.6.1-SNAPSHOT'