Change in ovirt-engine-sdk[sdk_3.5]: codegen: Calculate singulars correctly