Add support for headnode base-image selection

The deployment tests now require TWO base-images, named base-headnode and
base-headnode-2

The deployment tests pass.  I haven't specifically tested yet that we're really booting the right one, though.