Merge "Patch dhcp agent to avoid unwanted rescheduling" into stable/hunter