Merge pull request #1422 from jnpkrn/upgrade-xsl-2to3-part2
[part 2] Prepare XSL template for 2-to-3 schema upgrade