Changed TransactionCallback to TransactionCallbackWithoutResult where
appropriate.
Fix for enhancement NMS-5435
Refactor UrlFactory and adding basic support for HTTPS to the XML Collector.
replace spectrum-event-importer/ legacy logging

This is bitrotten and fails to build for reasons other than logging.
Modified this to expect only a 2 column csv file of nodelabel,ipaddress with properties
that control behavior such as requisition repo, csv file name, foreign source, etc.
make castor bits kepler-compatible
just generate for now
fix broken smslib dependencies
Merge branch '1.12'

Conflicts:
	protocols/xml/src/main/java/org/opennms/protocols/http/HttpUrlConnection.java
Merge branch 'master' into dao-refactor

Conflicts:
	opennms-dao/src/main/java/org/opennms/netmgt/dao/DatabasePopulator.java
	opennms-qosdaemon/src/main/java/org/openoss/opennms/spring/dao/OssDaoOpenNMSImpl.java
	opennms-services/src/main/java/org/opennms/netmgt/scriptd/helper/AlarmEventSynchronization.java