Merge "Isolate change_server_password to use its own server"