sync with develop & resolve conflict

fix for https://github.com/hpcugent/easybuild-framework/pull/1084, there was a conflict w.r.t. `xHOST` vs `xHost`