Merge changes from topic "am-89fe5346-d048-4a7e-b219-5691d6788fba" into oc-mr1-dev

* changes:
  [automerger] bug fix: handle multiple port settings change events signalled at once am: 0a542276f8  -s ours am: e1a544dcbd am: 8a52e9fd39
  [automerger] bug fix: handle multiple port settings change events signalled at once am: 0a542276f8  -s ours am: e1a544dcbd
  bug fix: handle multiple port settings change events signalled at once am: 0a542276f8  -s ours