Merge "HttpResponseCache should return 504, not 502."