Merge branch 'master' into frlayout-stability
Adding Bridge Dao for enhancel linkd
Added stpportpathcost to stp link
Added Transient Dot1dTpStatus to BridgeMacLink
Added the BridgeDiscovery for enhanced linkd

We need to set up the way in which
the bridge links are discovered and
persisted
Added IpNetToMedia to Object Model with table creation
Added IpNetToMediaDao
Added IpNetToMedia discovery to Enhanced Linkd
Add Edge Status Provider for LLDP links
fix unit test Nms0002EnTest
fix for liquibase issues, see OPENNMS-NMS15-SMOKE-64
it's OK that the checksums changed
Fix for Bug NMS-6564

The SFTP Connection are not closed when an exception is thrown using
3GPP XML Collector.

Conflicts:
	protocols/xml/src/main/java/org/opennms/protocols/xml/collector/AbstractXmlCollectionHandler.java
	protocols/xml/src/main/java/org/opennms/protocols/xml/collector/Sftp3gppXmlCollectionHandler.java
Merge remote-tracking branch 'origin/space/14.1-enlinkd' into space/14.1

Conflicts:
	core/schema/src/main/liquibase/1.13.1/changelog.xml
	opennms-dao-api/src/main/java/org/opennms/netmgt/dao/api/BridgeBridgeLinkDao.java
	opennms-dao/src/main/java/org/opennms/netmgt/dao/hibernate/BridgeBridgeLinkDaoHibernate.java
	opennms-dao/src/main/java/org/opennms/netmgt/dao/hibernate/IpNetToMediaDaoHibernate.java
	opennms-services/src/main/java/org/opennms/netmgt/enlinkd/EnhancedLinkdServiceImpl.java
	opennms-services/src/main/java/org/opennms/netmgt/enlinkd/IpNetToMediaTableTracker.java
Merge branch 'space/14.1-enlinkd' into space/14.1
Merge branch 'space/14.1-enlinkd' into space/14.1
Merge branch 'space/14.1-enlinkd' into space/14.1
Merge branch 'space/14.1' into frlayout-stability
rename New FR layout menu item to FR Layout
correct < operations to be !=