Various changes/improvements to standard/ templates (including support for YUM-based deployment)