logging prefix cleanup for ILR
make it so ILR can read old- and new-style logs
Added logging dependencies to the remote poller OneJar distribution and
added a log4j2.xml so that logging will be put in stdout correctly.
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
Fixing a minor cosmetic issue on editThreshold.jsp
initial commit of OTRS 3.1 integration code
Merge branch 'master' of github.com:OpenNMS/opennms into feature-otrs-3.1-integration
fix up threading in provisioning tests
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge branch '1.12'
fix initial creation of meta file immediately
Merge branch '1.12'

Conflicts:
	opennms-rrd/opennms-rrd-jrobin/src/main/java/org/opennms/netmgt/rrd/jrobin/JRobinRrdStrategy.java
	opennms-services/src/test/java/org/opennms/netmgt/collectd/PersistOperationBuilderTest.java
	opennms-services/src/test/java/org/opennms/netmgt/collectd/SnmpCollectorTest.java
actually create the alarm this time.... :)
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge branch '1.12'
Revert "initial commit of OTRS 3.1 integration code"

This reverts commit a28b8aa145550e1a969067485cfe2443658e4b63.
added SystemExecuteMonitor and depricated GpMonitor