zfsinstall: merge martin@ changes into my updated version