Merge "Force connection auth as part of RemoteClient in scenario"