Bug 3627: Remove old -r flag from condor_master invocation
Merge branch 'master_3627'