Bug 892520 - Ensure serialization of upgrade path