Backport new dev changes.  Fix protection system mistakenly using UUID for ownership by comparing both name and UUID.