Merge "IMS Conference fixes related to RemoteConnectionServices." into nyc-mr1-dev