Change in ovirt-engine[master]: core: Make sure the ClusterPolicy does not cause NPEs