Fixed #3129 Ensure country rules using USA are translated to the 2-char ISO code