changed the progenitor to not use god
Merge remote-tracking branch 'org/master' into monit-instead-of-god
Merge remote-tracking branch 'org/master' into monit-instead-of-god
Merge remote-tracking branch 'org/master' into monit-instead-of-god
removed unused constants
fixed broken java taskqueue
Merge remote-tracking branch 'org/master' into monit-instead-of-god
fully qualifying monit executable, since it wasn't in init's path
Merge pull request #755 from shatterednirvana/monit-instead-of-god

Fixed progenitor to not use god
Merge remote-tracking branch 'org/master' into haproxy-on-login-node