ACCUMULO-378 More rb changes.