MC-52: Move code from ConnectorMappingBundle