allowing dhcp options to be deleted by specifying delete-all
Merge remote-tracking branch 'origin/s-havana' into s-havana