ACCUMULO-2220 supporting ACCUMULO_CONF_DIR in test/system/bench
Merge remote-tracking branch 'origin/1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT'