Fix for Bug NMS-5985
NMS-5967 use the properties cache APIs for .meta files
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge branch '1.12'

Conflicts:
	container/karaf/src/main/filtered-resources/etc/custom.properties
	opennms-dao/src/main/java/org/opennms/netmgt/dao/support/ResourceTypeUtils.java
	opennms-rrd/opennms-rrd-api/src/main/java/org/opennms/netmgt/rrd/RrdUtils.java