support all dhcp options and also consider names specified in the configuration

Change-Id: I1bcd49be6578c9489471dc4dc61bf4e0c917f677
Merge "support all dhcp options and also consider names specified in the configuration" into R1.10