Merge "Retry on ServerFault in call_and_ignore_notfound_exc()"