HTCONDOR-1261 Changes per code review
HTCONDOR-1261 Changes per code review

htcondor/htcondor,htcondor/htcondor,htcondor/htcondor,htcondor/htcondor,htcondor/htcondor,htcondor/htcondor,htcondor/htcondor,htcondor/htcondor