Merge pull request #28 from jouvin/sl6.x-x86_64

Various fixes/improvements to ease replacement of classic (spma) OS temp...
Merge pull request #29 from jouvin/sl6.x-x86_64

Various improvements to sl6.x templates
Merge remote-tracking branch 'quattor/sl6.x-x86_64' into sl6.x-x86_64