Fixing bug NMS-6463 - The Upgrade Tools are throwing a NPE when a JMX service is not configured properly on collectd-configuration.xml
add explicit postgresql dependency to make sonar happy
Merge remote-tracking branch 'origin/1.10' into 1.12

Conflicts:
	pom.xml
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	core/upgrade/src/main/java/org/opennms/upgrade/implementations/JmxRrdMigratorOffline.java