Fixes for LCG 99 (run2-patches)

Mark Smithrequested to merge
lcg99_run2_patches into run2-patches

Port of !874 (merged) to run2-patches for LCG 99

Edited by Mark Smith

Merge request reports