Merge patch branch changes to main.

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/usergroup/UserGroupMemberUserGroupMapper.xml

@@ -96,7 +96,7 @@
             guacamole_entity.type = 'USER_GROUP'
             AND
             <choose>
-                <when test="caseSensitivity.caesSensitiveGroupNames()">
+                <when test="caseSensitivity.caseSensitiveGroupNames()">
                     guacamole_entity.name
                 </when>
                 <otherwise>

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/permission/UserGroupPermissionMapper.xml

@@ -135,7 +135,7 @@
                      open="(" separator=" OR " close=")">
                 ([guacamole_user_group_permission].entity_id = #{permission.entityID,jdbcType=INTEGER} AND
                  permission = #{permission.type,jdbcType=VARCHAR} AND
-                 affected_entity.type = 'USER_GROUP'
+                 affected_entity.type = 'USER_GROUP' AND
                 <choose>
                     <when test="caseSensitivity.caseSensitiveGroupNames()">
                         affected_entity.name = #{permission.objectIdentifier,jdbcType=VARCHAR}
@@ -189,4 +189,4 @@
 
     </insert>
 
-</mapper>
+</mapper>