Create trunk for remote-poller-nsis-installer
Move remote-poller-nsis-installer de facto trunk to nominal trunk
Promote remote poller NSIS installer from playground into NSIS installers area
Typo fix s/CUrrentVersion/CurrentVersion/g (thanks rdk)
Migrate ackd-configuration.xml from Castor to JAXB.
Use the JAXB dao for the ackd config.
Changed the way default values are handled. Check for nulls in equals() and hashCode().
Merge branch 'castor-to-jaxb' of git://github.com/j-white/opennms into j-white-castor-to-jaxb
Merge branch 'master' into pull-requests
Merge branch 'master' into pull-requests
Merge branch 'master' into pull-requests
Merge branch 'master' into pull-requests
Merge branch 'master' into pull-requests
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
Merge branch 'master' into pull-requests

Conflicts:
	opennms-ackd/src/test/java/org/opennms/netmgt/ackd/readers/HypericAckProcessorTest.java
	opennms-ackd/src/test/java/org/opennms/netmgt/ackd/readers/JavaMailAckReaderTest.java
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
Merge branch 'master' into pull-requests