ACCUMULO-2170 Collapse down spacing and remove 1.5.0 changes.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	CHANGES
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2170 Remove the -RC suffix from the tag name
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT'