Merge "multinode/upgrade: set heat::rpc_response_timeout to 600"