Merge "Handle explicit plural forms in custom convertPlural in language classes"