Merge "Set dhcp_client based on cirros version"