Merge pull request #48 from brianhlin/master

Various fixes to htcondor ce tools
Force HTCondor CE collector to use port 9619 (SOFTWARE-1696)