Gittrac #4091:  Committing the code; manual not updated yet (note:
version history entry needs to go into 8.1.4 section).
Gittrac #4091:  Improved warning message and changed the test to match.
Merge branch 'master' of /p/condor/repository/CONDOR_SRC
Gittrac #4091:  Merged code to master/8.1 and updated the manual.
Merge branch 'master' of /p/condor/repository/CONDOR_SRC