Merge branch 'BMK-968' into 'atlUseWalltime'

# Conflicts:
#   alice/gen-sim-reco-run3/alice-gen-sim-reco-run3.spec
#   alice/gen-sim-reco-run3/alice-gen-sim-reco-run3/alice-gen-sim-reco-run3-bmk.sh
#   alice/gen-sim-reco-run3/alice-gen-sim-reco-run3/parseResults.sh
#   alice/gen-sim-reco-run3/alice_spec_custom.txt
1 job for atlUseWalltime in 2 seconds (queued for 1 second)