avoid overwriting selected shipping method but not clearing the cart on every page view
Merge pull request #1318 from JeffPyeBrook/pr-1314-checkout-when-only-one-method

avoid overwriting selected shipping method but not clearing the cart on every page view