ACCUMULO-2494 fix rat check failure
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
ACCUMULO-2440 Use the correctBufferSize method to (correctly) fix the bufferSize when not provided.
Merge branch '1.6.0-SNAPSHOT'