LPS-48916 change use of server to connection manager