Merge "Model update to add external-id to port/interface."