Cherry-pick remove unsupported with_shipping_method
Merge pull request #48 from paul-at/without-shipping-method

remove unsupported with_shipping_method in 2-2-stable
Merge remote-tracking branch 'upstream/2-2-stable' into 2-2-stable