Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into oc-dev

* changes:
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0 am: 97668ae1 am: fddbf1b6 am: d3c0db66 am: 373cfa75 am: bdff04ab am: 7341805c am: 885a2ecf am: 54f1b302 am: 6b1b3c9b
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0 am: 97668ae1 am: fddbf1b6 am: d3c0db66 am: 373cfa75 am: bdff04ab am: 7341805c am: 885a2ecf am: 54f1b302
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0 am: 97668ae1 am: fddbf1b6 am: d3c0db66 am: 373cfa75 am: bdff04ab am: 7341805c am: 885a2ecf
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0 am: 97668ae1 am: fddbf1b6 am: d3c0db66 am: 373cfa75 am: bdff04ab am: 7341805c
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0 am: 97668ae1 am: fddbf1b6 am: d3c0db66 am: 373cfa75 am: bdff04ab
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0 am: 97668ae1 am: fddbf1b6 am: d3c0db66 am: 373cfa75
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0 am: 97668ae1 am: fddbf1b6 am: d3c0db66
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0 am: 97668ae1 am: fddbf1b6
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0 am: 97668ae1
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0
  Adjust URI host parsing to stop on \ character.