Merge branch 'sfa-geni-v2' of ssh://git.onelab.eu/git/tests into sfa-geni-v3