Merge "vfModule upgrade: don't fallback on mismatching newest model"