Fix for issue NMS-6910: PSQLException in EnhancedLinkd Cdp discovery

        Change the datatype of cdplink.cdpcacheversion to text.
Fix for Bug NMS-6774 - Exception thrown while running CDP discovery on Enhanced Linkd
Fix for NMS-6909: NonUniqueResultException BridgeDiscovery
Fix for NMS-6908: NullPointerException EnhancedLinkd Bridgediscovery
Fix for NMS-6911: Illegal Argument Exception in EnhancedLink Ospf Node Discovery
Fix for SPC-972 - Failed to save the new custom event definition.
Merge branch 'space/14.1' of git://github.com/OpenNMS/opennms into space-14.1
JUNIPER-ONLY: fix the PR of wrong prompt