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

* commit '06f2189a4eb7221ae5ef0eda451f4f7875b906b5':
  Fix XMLNS detection in SDK Repo XSD files.