Merged requested to merge emoyse/athena:master-fix-refitalg into master
Fixes for unchecked SC as mentioned in ATLASRECTS-4931.
Also did a bit of cleanup of the code to make it a little more readable. I also removed a deprecated jobProperty.
I added the jobOptions to RecExRecoTest, but haven't made this a proper ART test (ping @mhodgkin )