Merge pull request #15749 from seamuslee001/Additional_Fixes_to_workflow_templates