Merge packages::puavo and packages::thinclient to their image::*
classes, no need for separate classes.  Add package definitions
for image::builder.