Merge remote-tracking branch 'spree/2-2-stable' into promotion_fixes_nemo_22
Merge branch 'promotion_fixes_nemo_22' of github.com:godaddy/spree into promotion_fixes_nemo_22