Merge pull request #4296 from c-po/xml-cleanup
xml: T5738: reuse existing alpha-numeric-hyphen-underscore building block