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

Misc. changes to SL 5.8 templates
Merge pull request #25 from Pansanel/sl580-x86_64-spma

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