Change country name to country code when creating an address. Add missing setProductGroup
Merge branch 'develop-hotFix' into develop