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

sl6.x generic OS templates