[Bug 924519] FSRVP server state on-disk format upgrade for upstream