Added job_template.xml max num to keep
Fixed migration/scope issue