Revert "ACCUMULO-2170 Collapse down spacing and remove 1.5.0 changes."

This reverts commit a27f60b2e69c1df056ca6b1306017d93118d81f3.
ACCUMULO-2170 Re-fix the whitespace changes that I want.
ACCUMULO-2170 Update CHANGES with changes since 1.5.1-RC2
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	CHANGES
Merge branch '1.6.0-SNAPSHOT'