Merge pull request #3616 from nrwahl2/nrwahl2-xsl_transform4
Refactor: xml: Resolve id-refs at beginning of 3-to-4 upgrade pipeline