Merge branch 'lxc_devel' of github.com:planetlab/NodeManager into lxc_devel