Merge "[VVP] updating v6 regex for fip/ip and fip/subnet"