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

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