Force country code to uppercase when validating postal code. #2325
Replace regex rule for Canadian zip codes. #2325