Update to Spree 2.2.0.beta

Some minor changes to make spec pass and engine up-to-date.