clean up some dependency-related stuff found while working on Nexus
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge branch '1.12'

Conflicts:
	dependencies/rrd4j/pom.xml