Merge "wspr should not have a seperate retryTimeout."