Merge branch '1.12'

Conflicts:
	features/ncs/ncs-model/src/test/java/org/opennms/netmgt/model/ncs/JAXBTest.java
Merge branch '1.12'
Merge branch '1.12'
rework DefaultEventConfDao to be much faster and easier to understand
fix property change for reloadCheckInterval
use a partitioning strategy to find matching event -- partitioned by enterpriseId
handle null partition key on passed in event
fix matching of generic traps
fix varbind matching with multiple varbinds
Add toStrings to EventMatchers to enable easy logging and debugging
Also fix an off by one error for vbnumber (with is 1-indexed rather than 0-indexed)
put back enterprise partitioner and remove println
missed a few cleanups of event conf files
Merge branch '1.12'

Conflicts:
	pom.xml
Merge branch '1.12'

Conflicts:
	opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/DataLinkInterfaceDaoHibernateTest.java
problem when comparing LAST varbind in a list
update ncs path provider to support basic auth
change unit test to use http camel component instead of http4
Merge branch '1.12'
Merge branch '1.12'
Merge branch '1.12'