Move Ubuntu .deb packaging to an Ubuntu machine.
Change some names to be more generic.  Actual machines used are set in 1 place
and otherwise not used.