Change JOB_ROUTER_DEFAULTS to JOB_ROUTER_DEFAULTS_GENERATED so
sysadmins can easily override the defaults in future versions of
HTCondor.
Merge pull request #26 from brianhlin/master

SYSTEM_PERIODIC_HOLD and scheduler universe fixes