Merge "correctly report DHCP failures" into lmp-dev