Misc. changes to improve compatibility with YUM-based deployment and
sl6.x generic OS templates
Merge pull request #13 from jouvin/emi-3

Misc. changes to improve compatibility with YUM-based deployment and