Merge changes I58f904d5,Ie0bf7804

* changes:
  Fix DHCP options sent by DHCP server
  Fix BOOTP fields for server-generated DHCP packets