Merge changes I4decffcc,I283e88b1

* changes:
  Ignore DHCP discover and request w/ invalid giaddr
  Send ciaddr in DHCP server ACK if set by client