bring-in Lmod/5.5 related bits

Signed-off-by: Fotis Georgatos <fotis.georgatos@uni.lu>
Merge pull request #850 from fgeorgatos/contrib_Lmod-5.5

Contrib Lmod/5.5 & related bits