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