Merge "Add cloud param name as ip_address_type"