Re-add linkd to topology provider selection
Merge remote-tracking branch 'origin/master' into pjsm/2.0