Improve the way the auth server list is generated and account for a key being removed from the array when deleting. Fixes #7682
(cherry picked from commit fa628b1a15a1c03343caa2735e09de291ae4e382)
Improve the way the auth server list is generated and account for a key being removed from the array when deleting. Fixes #7682
(cherry picked from commit fa628b1a15a1c03343caa2735e09de291ae4e382)