Cleaned up feature and bundle names for topology and NRTG so that they
look prettier in the Karaf console.
Merge branch 'pjsm/2.0' of https://github.com/OpenNMS/opennms into pjsm/2.0
More feature name cleanup.