Change in ovirt-engine[master]: build: solve m2e manifest problems