We need to add an e2e test for the work we've done to ensure that reconnections are handled gracefully when we do a rolling restart of our control plane. There appears to still be an issue that needs to be investigate to go along with this e2e test.