Merge changes from patch branch back to main.

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml

@@ -214,7 +214,7 @@
                         JOIN [guacamole_entity] ON [guacamole_user].entity_id = [guacamole_entity].entity_id
                         WHERE
                             <choose>
-                                <hen test="caseSensitivity.caseSensitiveUsernames()">
+                                <when test="caseSensitivity.caseSensitiveUsernames()">
                                     CHARINDEX(#{term.term,jdbcType=VARCHAR} IN [guacamole_entity].name) > 0
                                 </when>
                                 <otherwise>

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

@@ -176,9 +176,9 @@
                 <when test="caseSensitivity.caseSensitiveGroupNames()">
                     affected_entity.name = permissions.affected_name
                 </when>
-                <test>
+                <otherwise>
                     LOWER(affected_entity.name) = LOWER(permissions.affected_name)
-                </test>
+                </otherwise>
             </choose>
         JOIN [guacamole_user_group] affected_group ON affected_group.entity_id = affected_entity.entity_id
         WHERE NOT EXISTS (SELECT 1 FROM [guacamole_user_group_permission]

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

@@ -141,7 +141,7 @@
                         affected_entity.name = #{permission.objectIdentifier,jdbcType=VARCHAR}
                     </when>
                     <otherwise>
-                        LOWER(affected_entity.name = LOWER(#{permission.objectIdentifier,jdbcType=VARCHAR})
+                        LOWER(affected_entity.name) = LOWER(#{permission.objectIdentifier,jdbcType=VARCHAR})
                     </otherwise>
                 </choose>
                 AND

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/usergroup/UserGroupMapper.xml

@@ -179,7 +179,7 @@
                     LOWER([guacamole_entity].name) IN
                     <foreach collection="identifiers" item="identifier"
                              open="(" separator="," close=")">
-                        LOOWER(#{identifier,jdbcType=VARCHAR})
+                        LOWER(#{identifier,jdbcType=VARCHAR})
                     </foreach>
                 </otherwise>
             </choose>