am d2c21c15: am 8c166512: Merge "Cleanup of process-specific DNS." into eclair

Merge commit 'd2c21c1518631edd798367cf20cbc5434321d266'

* commit 'd2c21c1518631edd798367cf20cbc5434321d266':
  Cleanup of process-specific DNS.