Merge changes from topic "am-f8d9284a-cfc8-4e4b-8915-eaac6542f6b5" into oc-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d am: 4938d3e5 am: 498d367b am: d6f4a3f2 skipped: ad38008f
  [automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d am: 4938d3e5 am: 498d367b am: d6f4a3f2
  [automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d am: 4938d3e5 am: 498d367b
  [automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d am: 4938d3e5
  [automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d
  [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings.