Changed enabled() and display() methods of linked topology provider to only return true if linkd topology is selected. Changed some stuff in VMware topology provider to reflect the API changes.
Merge branch 'master' of ssh://opennms.git.sourceforge.net/gitroot/opennms/opennms