Master

Merged Simon Michnowicz requested to merge (removed):master into master

Simon's changes to support ubuntu with mellanox and slurm

Merge request reports