Update default same product rule

Working on pulling in the latest returns & exchange stuff from bonobos/spree/2-2-dev.

Changes:

- allows the SameProduct rule to exchange an item for the same item
- filters out out-of-stock variants for the SameProduct rule

Line is too long. [188/80]