Fixes U4-2404 Photo gallery broken on Azure - Since the template saving routine is doing ToSafeAlias, we should also do it when setting the default template
Merge branch '6.0.7' of github.com:umbraco/Umbraco-CMS into 6.0.7
Merge branch '6.0.7' into 6.1.2