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

Change-Id: Id89a5b7da91ef7f099388b5623a3bed55680d046
Merge "support all dhcp options and also consider names specified in the configuration"