relay: add server retrieval to connection manager
relay: fix tests
Merge branch 'develop' into dcc