Description of problem: As part of Bug 1127606 we fix NPE flow and semantic code changes. This bug covers those patches for ovirt-3.5
oVirt 3.5 has been released and should include the fix for this issue.