Merge "Remove Atomic methods from ConnectionManagers"