Merge "Validation for new oam_cidr caas parameter"