Merge "Add disable-job var to packaging templates"