Rebasing devel into job_templates again