Merge "Extend retry sleep after server fault"