Fixes merger conflicts for the 2.1 branch in cookie splitting PR #3807

[cwillum]

Description

This fixes a merge conflict in the PR: Add new settings for SAML and OIDC that allow for cookie splitting #3807

Issues Resolved

Merge conflict resolved in #3807 for the 2.1 branch.

Checklist

• By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and subject to the Developers Certificate of Origin.
  For more information on following Developer Certificate of Origin and signing off your commits, please check here.

[opensearch-trigger-bot]

The backport to 2.1 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.1 2.1
# Navigate to the new working tree
pushd ../.worktrees/backport-2.1
# Create a new branch
git switch --create backport/backport-3890-to-2.1
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f6328add42191621ea8bac8d632f45dd7298df76
# Push it to GitHub
git push --set-upstream origin backport/backport-3890-to-2.1
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.1

Then, create a pull request where the base branch is 2.1 and the compare/head branch is backport/backport-3890-to-2.1.