Issue #906976 by derhasi and usonian and dwightaspinwall: Country set to 'us' (United States) when no value supplied in non-required address
