Fix for NMS-6294 for banner validation in GpDetector.
Update OSPF-TRAP-MIB events (NMS-6295)
Add trap events from CISCO-IF-EXTENSION-MIB (NMS-6296)
change to use AtomicInteger to fix synchronization issues
NMS-6221 fix provisiond clobbering geodata
fix out-of-order event conf
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-services/src/main/java/org/opennms/netmgt/xmlrpcd/EventQueueProcessor.java