Added ubuntu-guest into our repo again and also renamed
most of the guest elements to match the version number of the
database