Merge branch 'shotgun-tuning-fix' into 'master'

shotgun: fix reverting back to un-tuned values

See merge request !9
3 jobs for master
in 25 seconds and was queued for 2 seconds