Merge branch 'lxc_devel' of ssh://git.onelab.eu/git/bootmanager into lxc_devel