Change in ovirt-engine-cli[cli_3.5]: cli: Calculate singulars and plurals correctly