Merge "Cleanup of process-specific DNS." into eclair