Return 504 instead of 408 when call to broker times out