Fix for Bug NMS-6757

High CPU usage due to DataCollectionConfigDao.getConfiguredResourceTypes() while Collectd starts.
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-config/src/main/java/org/opennms/netmgt/config/DefaultDataCollectionConfigDao.java