Conflicts: easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goalf-1.1.0-no-OFED.eb easybuild/framework/easyblock.py easybuild/tools/filetools.py