Merge branch 'develop' of ssh://software.ecmwf.int:7999/eccodes/eccodes into develop

bamboo/INTEL-env.sh

@@ -2,6 +2,8 @@
 if [[ ! $(command -v module > /dev/null 2>&1) ]]; then
   . /usr/local/apps/module/init/bash
 fi
-# grib_api module conflicts with intel module
+# Unload modules not available for Intel
 module unload grib_api
+module unload emos
+module unload libemos
 module switch gnu intel/15.0.2