ACCUMULO-3048 Add in new fixes after rc0
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	CHANGES
Merge branch '1.6.1-SNAPSHOT'