Update to 1.6. This uses "firstboot" support in the base system, so
provide an option which reverts back to the old version of this port.

I'm making it a configurable option rather than autodetecting based
on OSVERSION to make my life easier with "cross-building" images.