Merge "Move dhcpcd off its own getline."