Fix for Bug NMS-6074
Merge remote-tracking branch 'origin/1.10' into 1.12
ignore "resources"
NMS-6076 use data tmp directory for the JVM
Fix for Bug NMS-6075
Fix for Bug NMS-6024
Fix for Bug NMS-6080
Fix for Bug NMS-6077
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-config-tester/src/test/java/org/opennms/netmgt/config/tester/ConfigTesterTest.java