Merge pull request #6 from jouvin/sl580-x86_64-spma

Misc. changes to SL 5.8 templates