Merge "Enable dhcp service flag set for ODL Dhcp"