Make label tag for equal to radio button id

Fixes #4561
Fix issue where deleted variants do not show up in admin when requesting deleted variants

Fixes #4562
Improve code indentation. It was hard to read before.

Signed-off-by: Jaime Victoria <jaime.victoria@crowdint.com>

Fixes #4568
don't hide the shipping cost line when order is shipped
fix N+1 query performance issues on TaxRate.match method

Conflicts:
	core/app/models/spree/tax_rate.rb
[Sample] Fix ENV['LIB_NAME
']
handle empty products set on cache_key_for_products
rely on maximum return to fall back on static date

Fixes #4565
Make rspec random ordering the extension default
Drop deprecation warning for `relation.sum(&:block)`
Use ActiveSupport::JSON as Rabl json_engine

Ensure all data returned by the api is valid json

Fixes #4589
allow product rule to match 'none'

Fixes #4587
Add index to spree_orders for user_id & created_by_id

Addresses potential performance regressions discussed at #4582 in the last_incomplete_spree_order method arising after that method changed in c455e1a

Fixes #4584
Fix for #4234.
Merge branch '2-2-stable' of github.com:spree/spree into 2-2-stable