1141429: Ensure that in the case of duplicated DNS names from Hadoop that a min retry millis is ensured
Merge branch 'master', remote-tracking branch 'origin' into M7.GA