Merge branch 'hotfix/missing_script_dir'
Different handling of jobs we are trying to submit twice.
Merge branch 'hotfix/problems_with_overlapping_schedules' into develop