Fix for enhancement NMS-5466
fix logging context for ICMP requests
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	protocols/xml/src/main/java/org/opennms/protocols/http/HttpUrlConnection.java
	protocols/xml/src/main/java/org/opennms/protocols/xml/collector/Sftp3gppXmlCollectionHandler.java
	protocols/xml/src/test/java/org/opennms/protocols/sftp/Sftp3gppUrlConnectionTest.java
Merge branch 'master' of github.com:OpenNMS/opennms
fix timing of snmp4j trap test
Added ability to migrate auto-discovered nodes to provisioning groups
based on an IPLIKE query.  More flexible query types will come later,
this one just solves a use case for a customer this week.
A few fixes.
Added property for default list of services to add to node.
Fixed some compiler warnings by statically accessing the logger.
Merge branch 'master' into feature-hibernate4-upgrade