Use a string comparsion for locale parameters

Conflicts:
	core/lib/spree/core/controller_helpers.rb
Stringify api_key

Fixes #2492

Conflicts:
	api/app/controllers/spree/api/v1/base_controller.rb