fix N+1 query performance issues on TaxRate.match method

Conflicts:
	core/app/models/spree/tax_rate.rb
Fix deprecation warning.