Only trim instead of completely removing whitespace from zip codes.

Also add same trim to domain reg contact zip for consitency.

Closes Bug 344.

Change-Id: I214ea9b0fb3523f2eaf86c7c3d62832b6f9ea964
Copy en-US

Change-Id: Ibc30d279f946d1ee97e7b3605d684ca7abb4b402
Merge "Copy en-US"