Fix warning in cmake about concatenated string arguments
Merge branch 'master' of /p/condor/repository/CONDOR_SRC