Trim whitespace from critical fields in requisition editor (NMS-6314)
NMS-6315 Added data collection and events for HWg Poseidon sensors
Fix NMS-6313: IPv6 IPLIKE expressions incorrectly rejected in notification wizard
fix data collection config updates
No longer rely on opennms-base-assembly for datacollection config tests.
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-config/src/test/java/org/opennms/netmgt/config/DataCollectionConfigParserTest.java