Merge branch 'geni-v3' of ssh://git.planet-lab.org/git/sfa into geni-v3