removed risky regex template version number replacement, and added XMLDOM versions
(cherry picked from commit 7d4fda073ce35ecaa0003003fa85bc0b60bcb706)
pulled in and re-jiggered templates