Merge branch 'master' into 1969-persistent-switch

Conflicts:
	services/api/app/controllers/application_controller.rb

diff --cc apps/workbench/app/controllers/users_controller.rb
Simple merge

diff --cc apps/workbench/config/routes.rb
Simple merge

diff --cc services/api/app/controllers/application_controller.rb
index 4e7b73bf94250ed234e0630229c743a17aaca3f2,6339125a00b69f2991353c8e6c91a7bb2f9be0c8..6907faf1c2649a63f5e408837092628dbfb22807
--- 1/services/api/app/controllers/application_controller.rb
--- 2/services/api/app/controllers/application_controller.rb
+++ b/services/api/app/controllers/application_controller.rb
@@@ -202,10 -315,7 +315,10 @@@ class ApplicationController < ActionCon
                value[0] == 'contains' then
              ilikes = []
              model_class.searchable_columns('ilike').each do |column|
-               ilikes << "#{table_name}.#{column} ilike ?"
 +              # Including owner_uuid in an "any column" search will
 +              # probably just return a lot of false positives.
 +              next if column == 'owner_uuid'
+               ilikes << "#{ar_table_name}.#{column} ilike ?"
                conditions << "%#{value[1]}%"
              end
              if ilikes.any?