This needs to be backported for LDAP-enabled Atlas users to be able to upgrade with no disruptions introduced