- work version of Entopology, but spring doesn't like Entities with the same Classname
Merge branch 'features/linkd-scalability' of /opt/opennms/rcs/opennms into features/linkd-scalability

Conflicts:
	opennms-dao/src/test/java/org/opennms/netmgt/dao/entopology/HibernateEnTopologyDaoTest.java