Merge "Remove artifacts left by 'dns' role tests"