Merge pull request #2 from jouvin/sl470-x86_64-spma

Misc. changes to SL4.7 64-bit templates