Merge "Fix idempotence issue in dns role"