Merge "Get cidr/mask_bits according to ip_version in resource_setup"