Merge "Rename get/setRetryInterval to get/setRetryIntervalsMs"