Merge remote-tracking branch 'upstream/1.5' into 1.5-Auditing

Conflicts:
	server/src/main/java/org/apache/accumulo/server/mini/MiniAccumuloCluster.java
	server/src/test/java/org/apache/accumulo/server/mini/MiniAccumuloClusterTest.java