ACCUMULO-2332 More whitespace altercations
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
Merge branch '1.6.0-SNAPSHOT'