Gittrac #4189:  Fixed manual merge error that caused job_dagman_dont_use_default_node_log to fail.
Gittrac #4189:  Fixed manual merge error that caused
job_dagman_dont_use_default_node_log to fail.

zhangzhehust/htcondor,htcondor/htcondor,htcondor/htcondor,htcondor/htcondor,htcondor/htcondor,djw8605/htcondor,zhangzhehust/htcondor,htcondor/htcondor,htcondor/htcondor,djw8605/htcondor,djw8605/htcondor,zhangzhehust/htcondor,neurodebian/htcondor,neurodebian/htcondor,djw8605/htcondor,djw8605/htcondor,neurodebian/htcondor,zhangzhehust/htcondor,neurodebian/htcondor,zhangzhehust/htcondor,zhangzhehust/htcondor,neurodebian/htcondor,zhangzhehust/htcondor,htcondor/htcondor,zhangzhehust/htcondor,djw8605/htcondor,zhangzhehust/htcondor,neurodebian/htcondor,djw8605/htcondor,neurodebian/htcondor,neurodebian/htcondor,neurodebian/htcondor,djw8605/htcondor,htcondor/htcondor,djw8605/htcondor