Change in ovirt-engine[ovirt-engine-3.6.2]: core: Add TODO once fix will be backported