Fix for NMS-6165 - possible thread contention checking datacollection-config.xml
Fix for NMS-6141 - Set default log level to WARN (like 1.10)
Merge remote-tracking branch 'origin/1.12' into space/13.2

Conflicts:
	opennms-base-assembly/src/main/filtered/etc/log4j.properties