Merge "Revert "Move the job scheduler service code to its own jar file.""