Merge branch 'develop' into contrib_ictce_5.3.0_missing

Conflicts:
	easybuild/easyconfigs/f/freeglut/freeglut-2.8.1-ictce-5.3.0.eb
	easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goalf-1.1.0-no-OFED.eb
	easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-goolf-1.4.10.eb
	easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-3.2.2.u3.eb
	easybuild/easyconfigs/h/HDF/HDF-4.2.7-patch1-ictce-5.3.0.eb
	easybuild/easyconfigs/h/HDF/HDF-4.2.8-iqacml-3.7.3.eb