Pull USPS API changes into master

Sync with 2-0-stable branch commit 0dc25be0139e0345b1200cb41d8606bfc1f8ef92