Merge "Add update yaml backward compatibe with PublicVirtualIP on ctlplane"