Merge change 22638 into eclair

* changes:
  Fix the removal of dns entries.