Make hostname valid for ubuntu-desktop def
Convert cloud-debian-7.1.0-x86_64 to new structure
Cleanup ubuntu-desktop def