Merge the DAO refactor branch

- move DAO APIs into opennms-dao-api
- create new mock DAOs in opennms-dao-mock
- create a new test context that is a drop-in
  replacement for applicationContext-dao.xml
  (applicationContext-mockDao.xml)
- create a new test context that creates a
  mock event daemon (applicationContext-mockEventd.xml)
- update many tests to use the new mock DAOs
- update many tests to use the minimalist event
  and collection configs
- many other small tweaks and cleanups
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.
Add more enhancements for converting auto discovered nodes to provisioning groups.
This change addes the node's existing categories to the requisition.
Change categories collection to Set from List
Merge code and repair for the change to dao to dao.api
For Testing