Avoid duplicate maps in ConnectorMap and return native collections

Fixes #10939 and enables #10937

Change-Id: Icb46db31b02fa13a0612b0c24477b639a0e5684b
Merge "Avoid duplicate maps in ConnectorMap and return native collections" into 7.0