shipping provider settings page fixes
Merge pull request #596 from protherj/test-110

Test 110