Second commit for linkd test refactoring
Merge branch 'features/TS' of github.com:OpenNMS/opennms into features/TS