Fix failure to fully test job policy backwards compatibility. #4164

Looks like someone used copy/paste here to duplicate code and
did not make all the neccesary edits.
Fix bug processing some condor_q flags when using Quill. #4166
Merge branch 'V8_0-branch'