Fix template packaging issue
Merge pull request #11195 from mtorromeo/fix/package-templates

Fix template packaging issue