Misc. changes to SL 5.8 templates

Part of initial move to GitHub