LCG 99 fixes (run2-patches)

Mark Smithrequested to merge
lcg99_run2_patches into run2-patches

Ported from !761 (merged)

Started this at the end. Other packages to follow.

Edited by Mark Smith

Merge request reports