Fix condor_updates_stats syntax #3579
Scheddd also advertises weighted demand #3574
Merge branch 'master' of /p/condor/repository/CONDOR_SRC

Conflicts:
	src/condor_schedd.V6/schedd.cpp
	src/condor_schedd.V6/scheduler.h