Merge "Allow forcing nova compute_id"