[stable/zed] [ATMOSPHERE-584] Fix the number of max active fernet keys in Keystone

[vexxhost-bot]

Manual cherrypick required.

#2109 failed to apply on top of branch "stable/zed":

Applying: Fix the number of max active fernet keys in Keystone
Using index info to reconstruct a base tree...
M	.charts.yml
M	charts/keystone/Chart.yaml
M	charts/keystone/templates/bin/_cred-clean.py.tpl
M	charts/keystone/templates/bin/_endpoint-update.py.tpl
M	charts/keystone/values.yaml
Falling back to patching base and 3-way merge...
Auto-merging charts/keystone/values.yaml
Auto-merging charts/keystone/templates/bin/_endpoint-update.py.tpl
CONFLICT (content): Merge conflict in charts/keystone/templates/bin/_endpoint-update.py.tpl
Auto-merging charts/keystone/templates/bin/_cred-clean.py.tpl
CONFLICT (content): Merge conflict in charts/keystone/templates/bin/_cred-clean.py.tpl
Auto-merging charts/keystone/Chart.yaml
CONFLICT (content): Merge conflict in charts/keystone/Chart.yaml
Auto-merging .charts.yml
CONFLICT (content): Merge conflict in .charts.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix the number of max active fernet keys in Keystone
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".