fix conflict with develop

@Bart-CER: this fixes a conflict in `develop` that's blocking https://github.com/hpcugent/easybuild-easyblocks/pull/406 from being merged in

don't try to review this, it basically contains everything in current `develop` that's not in your branch yet :)