Fix for Bug NMS-5806
Merge remote-tracking branch 'origin/1.10' into 1.12

Conflicts:
	opennms-dao/src/test/java/org/opennms/netmgt/dao/support/ResourceTypeUtilsTest.java