am 627afeae: resolved conflicts for merge of 002acfc3 to stage-korg-master

* commit '627afeae86cf877b53316d976f53c3735414f3ca':
  Fix XMLNS detection in SDK Repo XSD files.