Stable: Update support for sbatch, fix intermittent problem with amica

Closed Brad Kennedy requested to merge dev into master

Waiting on testing to proceed

Merge request reports