Merge branch '1.8' of ssh://git.planet-lab.org/git/nodemanager into 1.8