Allow use of XX for the last 2 digits in a 5-digit zip code.

This closes feature #1456