Merge branch 'master' into 16811-public-favs

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --combined services/api/app/models/arvados_model.rb
index 07bedebfaa7e7a2c430afea10752b45f747bf98a,709b4b4d1c1304e456c494a4079ca2ea0cccc8fb..3966b7c3939edc31cdc4490b27285a565da0a84a
--- 1/services/api/app/models/arvados_model.rb
--- 2/services/api/app/models/arvados_model.rb
+++ b/services/api/app/models/arvados_model.rb
@@@ -454,7 -454,7 +454,7 @@@ class ArvadosModel < ApplicationRecor
    end
  
    def logged_attributes
-     attributes.except(*Rails.configuration.AuditLogs.UnloggedAttributes.keys)
+     attributes.except(*Rails.configuration.AuditLogs.UnloggedAttributes.stringify_keys.keys)
    end
  
    def self.full_text_searchable_columns
@@@ -627,12 -627,7 +627,12 @@@
    end
  
    def permission_to_destroy
 -    permission_to_update
 +    if [system_user_uuid, system_group_uuid, anonymous_group_uuid,
 +        anonymous_user_uuid, public_project_uuid].include? uuid
 +      false
 +    else
 +      permission_to_update
 +    end
    end
  
    def maybe_update_modified_by_fields