Add support for headnode base-image selection

The deployment tests now require TWO base-images, named base-headnode and
base-headnode-2