Revert "Bump 2-2-stable to upcoming 2.2.1"

This reverts commit f842bba6f0fc7c3804b915d28d009930c46a50c2.

Stable branch should not bump version at all until it is released.
Need to pass through a content-type when using upload_image to appease paperclip
Revert "Bump Paperclip to 4.1.1"

This reverts commit e867cf0ceada045e477f60d92f1fb0ef3d163f80.
Revert "Need to pass through a content-type when using upload_image to appease paperclip"

This reverts commit b04d57cd7ed194fcf59c4ed67e844c832bdbcc2d.
Fixes #4304 - RABL cache collision for variants

This uses string prefixes within each variant template to ensure unique cache keys and guarantees no collisions.

Fixes #4308
payment_method_spec: avoid INSERT in before(:all)

This before(:all) block (which is outside of the database transaction
that specs are run in) was creating four payment methods which caused
order_spec to fail occasionally.

This changes it to a normal before block.

Fixes #4372
Give variants big/small templates better names

This also fixes an issue introduced by 5f5201031195b21510cb2b7090dc46aab31c3a8a, where rabl_cache_spec was expecting stock_items to be empty, but was actually seeing them
Don't assert that find is called in ShippingMethodsController spec

We only care that it returns the object we want, not that it's called

This has the added side-effect of fixing the failing tests
Bump 2-2-stable to upcoming 2.2.1
Revert "Bump 2-2-stable to upcoming 2.2.1"

This reverts commit f842bba6f0fc7c3804b915d28d009930c46a50c2.

Stable branch should not bump version at all until it is released.
Bump to 2.2.1.beta
fix _taxonomies.html.erb cache key

Fixes #4390
Use 2-2-stable for sandbox script
Update to support new Universal Analytics

This change is backwards compatible and supports the new ga universal analytics site property id. GA sets this to the base domain name minus www. https://developers.google.com/analytics/devguides/collection/upgrade/?hl=en_US

Fixes #4389
Explicitly pass a token through on taxonomy API requests