r417 Upgrade > Stores > Search Feature Update
Merge remote-tracking branch 'origin/r417upgrade' into r417upgrade

Conflicts:
	app/models/concerns/store_searchable.rb