Merge upstream updates and fix conflicts.

Apply the latest updates from upstream while keeping the SMC customizations and while also keeping the old DB fields until SMC-Connect is updated.

Fix Rubocop offenses in locations_controller, search_controller, and search.rb.