fix merge conflict in GCC easyblock (+ update to develop)

fix merge conflict w.r.t. #396 caused by #400