Changes for Spree 2-2-stable

~~Test does not pass due to a bug in spree_static_content (https://github.com/spree/spree_static_content/pull/146).~~