Merge "Fix DHCP handling at disconnect/reconnect" into jb-mr1-dev