Also avoid sending UPDATE_JOB_AD to standard universe jobs #3785
Merge branch 'V8_0-branch' of /p/condor/repository/CONDOR_SRC into V8_0-branch
manual within V8_0-branch is now set up for version 8.0.4
Merge branch 'V8_0-branch'

Conflicts:
	doc/condor-macros.tex
	src/condor_schedd.V6/qmgmt.cpp