Merge pull request #707 from rustyswayne/1.3.0

Obsoletes CatalogFixedRateShippingApiController and replaces it with simpler FixedRateShippingApiController
Refactored ShipRateTableDisplay to accept a ShipCountryKey for back office UI requirement.