Rebase 2-2-dev on top of Spree v2.2.2

Spree v2.2.2 was published last week.  If this seems OK then I'll force-push this to 2-2-dev.

I'm getting some spec failures locally even on Spree's v2.2.2 so I'm curious to see if they will pass here.