Merge "hammerhead: Change dhcdcp options" into klp-dev