Change big variant rabl template to have consistent image structure with small variant rabl template. Fix potentially colliding cache keys.

Signed-off-by: Jordan Brough <git.j@brgh.net>

Fixes #4457
Add tax_total back to api_helpers#order_attributes

Conflicts:
	api/app/helpers/spree/api/api_helpers.rb