Migrate to 2.2 spree version

Read the commits...