Merge branch 'sgrvingt' into 'master'

[nancy] move grvingt-41,42,45,46 from the last breakout port of sgrvingt to normal ports

See merge request grid5000/reference-repository!617