B#947 Checkout Shipping Page Issues - Fixes
Merge pull request #86 from loadedcommerce/B947

B#947 Checkout Shipping Page Issues - Fixes