Change in ovirt-engine[master]: core: CloudInit + templates fix