added changes ported from overcloud-source template