Change in ovirt-engine[master]: core: Change Optional.of() to Optional.ofNullable()