sync with develop & resolve conflicts

required for https://github.com/hpcugent/easybuild-easyconfigs/pull/1017