Cherry-picked the commits of the test for gittrac #622 (68f343394b485e113dedbdd560fa468bbadfdd52, c8b113debe2df13151ca98a8c572102a7400f5b7, and 1753a0fb349d981bbfde9883a666ead2734a5be1) and manually resolved conflicts in the Imakefile.
Cherry-picked the commits of the test for gittrac #622
(68f343394b485e113dedbdd560fa468bbadfdd52,
c8b113debe2df13151ca98a8c572102a7400f5b7, and
1753a0fb349d981bbfde9883a666ead2734a5be1) and manually resolved
conflicts in the Imakefile.

djw8605/htcondor,zhangzhehust/htcondor,mambelli/osg-bosco-marco,htcondor/htcondor,neurodebian/htcondor,neurodebian/htcondor,djw8605/htcondor,djw8605/htcondor,zhangzhehust/htcondor,mambelli/osg-bosco-marco,bbockelm/condor-network-accounting,djw8605/condor,clalancette/condor-dcloud,clalancette/condor-dcloud,mambelli/osg-bosco-marco,djw8605/condor,neurodebian/htcondor,djw8605/condor,zhangzhehust/htcondor,neurodebian/htcondor,clalancette/condor-dcloud,djw8605/condor,neurodebian/htcondor,djw8605/htcondor,bbockelm/condor-network-accounting,mambelli/osg-bosco-marco,djw8605/htcondor,neurodebian/htcondor,htcondor/htcondor,zhangzhehust/htcondor,bbockelm/condor-network-accounting,mambelli/osg-bosco-marco,bbockelm/condor-network-accounting,htcondor/htcondor,neurodebian/htcondor,mambelli/osg-bosco-marco,djw8605/condor,bbockelm/condor-network-accounting,djw8605/condor,htcondor/htcondor,djw8605/condor,clalancette/condor-dcloud,bbockelm/condor-network-accounting,neurodebian/htcondor,bbockelm/condor-network-accounting,zhangzhehust/htcondor,htcondor/htcondor,djw8605/htcondor,djw8605/htcondor,mambelli/osg-bosco-marco,zhangzhehust/htcondor,djw8605/htcondor,mambelli/osg-bosco-marco,htcondor/htcondor,djw8605/condor,bbockelm/condor-network-accounting,htcondor/htcondor,htcondor/htcondor,zhangzhehust/htcondor,neurodebian/htcondor,clalancette/condor-dcloud,clalancette/condor-dcloud,djw8605/htcondor,clalancette/condor-dcloud,zhangzhehust/htcondor,zhangzhehust/htcondor