Merge "bug fix: handle multiple port settings change events signalled at once am: 0a542276f8  -s ours am: 2d7693b618  -s ours" into oc-mr1-dev