fix jaxb tests to use xmldiff
Preventing downcasting when the object can be null and other refactoring
fixing the incorrect display of line item count
TLE-31 Cisco Vtp Support

Added support for cisco vlan
in BridgeDiscovery
Merge branch 'master' into features/linkd-scalability