Rebase from the ipxe/ipxe

Bringing in code from the original upstream (ipxe/ipxe)