preserve shipping method when shipments change#3

gvaughn merged 2 commits intonov_9_with_gift_return_cherry_picksbonobos/solidus:nov_9_with_gift_return_cherry_picksfrom

preserve_shipping_methodbonobos/solidus:preserve_shipping_methodCopy head branch name to clipboard