Merge remote branch 'origin/trunk' into trunk
Merge remote branch 'ekohlwey/ACCUMULO-1551' into trunk