(#3477) Implement corrections as agreed.  Also fixed double-delete bug.
(#3477) Implement corrections as agreed.  Also fixed double-delete bug.

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