Steve Riesenberg 9db33f33c7 Revert unnecessary merges on 6.0.x ... This commit removes unnecessary main-branch merges starting from 8750608b5b and adds the following needed commit(s) that were made afterward: - 5dce82c48b		2023-10-31 15:11:45 -05:00
..
java/org/springframework/security/acls	Revert unnecessary merges on 6.0.x	2023-10-31 15:11:45 -05:00
resources	Allow use of non-numeric (e.g. UUID) values for ObjectIdentity.getIdentifier()	2017-10-29 21:29:12 -05:00