Change in ovirt-engine[master]: core: Adding 3.6 support