sync with develop, conflict in imkl.py easyblock resolved

@wpoely86: for https://github.com/hpcugent/easybuild-easyblocks/pull/273, I'll merge that in (after testing has confirmed it doesn't break imkl builds, it really shouldn't though)