Revert "Revert "Merge branch 'master' of ssh://opennms.git.sourceforge.net/gitroot/opennms/opennms""

This reverts commit 0baa703707fd09dc638120c4e1664d77cad73b2d.
Revert "Revert "Fixed styleName property on edges so that they are shown properly. Fixed""

This reverts commit b2cc848df670a888e638a3f129aafd9469307d82.
Cleaned up hashCode() and equals() methods so that HashMaps can properly
store unique vertex and edges as keys. Cleaned up the DefaultLayout code
slightly and changed SimpleTopologyProvider so that the Refresh
operation works properly with it.
Cleaned up GCFilterableContainer. Removed unused LinkdVertex class.
Merge branch 'master' of ssh://opennms.git.sourceforge.net/gitroot/opennms/opennms

Conflicts:
	features/topology-map/org.opennms.features.topology.api/src/main/java/org/opennms/features/topology/api/GraphContainer.java
	features/topology-map/org.opennms.features.topology.app/src/main/java/org/opennms/features/topology/app/internal/SimpleGraphContainer.java
	features/topology-map/plugins/org.opennms.features.topology.plugins.devutils/src/test/java/org/opennms/features/topology/plugins/devutils/internal/SaveToXmlTest.java
	features/topology-map/plugins/org.opennms.features.topology.plugins.topo.onmsdao/src/test/java/org/opennms/features/topology/plugins/topo/onmsdao/internal/OnmsTopologyProviderTest.java
	features/topology-map/plugins/org.opennms.features.topology.plugins.topo.simple/src/test/java/org/opennms/features/topology/plugins/topo/simple/internal/SimpleTopologyProviderTest.java
	features/topology-map/plugins/pom.xml

Resolved the merge problems and also updated VmwareTopologyProvider to
conform to the new GraphProvider API.
Merge branch 'master' of ssh://opennms.git.sourceforge.net/gitroot/opennms/opennms
Merge branch 'master' of ssh://opennms.git.sourceforge.net/gitroot/opennms/opennms