Merge "Fix nova upgrade pinning"