Merge "Add a default dns entry if none is provided"