I am having issues with upgrading version 6.16 to 6.25. (This is to fix an issue on our live site http://issues.umbraco.org/issue/U4-5992 issue on live site)

I tried Upgrading 6.16 to 6.20 first which is the next version and the upgrade process gets stuck at 90% with an error. I looked in the trace log and it is complaining about extra tables being in the database

2016-01-08 10:47:10,371 [10] INFO Umbraco.Core.DatabaseContext - [Thread 12] The database schema validation produced the following summary: The following tables were found in the database, but are not in the current schema: icUrlTracker,UFWorkflowsToForms,UFSettings,UFPrevalueSources,UFUserSecurity,UFDataSources,UFFormStates,UFPrevalueSourceSettings,UFDataSourceMappings,UFForms,UCUserSettings,UFWorkflowExecutionStates,UFWorkflows,UFRecordsXml,UFRecords,UFUserFormSecurity,UFPages,UFRecordFields,UFFieldsets,UFFields,UFFieldSettings,UFPrevalues,UFRecordDataString,UFRecordDataLongString,UFRecordDataInteger,UFRecordDataDateTime,UFRecordDataBit,UFFieldConditions,UFFieldConditionRules,AllContentData,vwCrmUfRecordFieldValues,ConciergeLockUnLock

The following columns were found in the database, but are not in the current schema: icUrlTracker,Id,icUrlTracker,OldUrl,icUrlTracker,OldUrlQueryString,icUrlTracker,OldRegex,icUrlTracker,RedirectRootNodeId,icUrlTracker,RedirectNodeId,icUrlTracker,RedirectUrl,icUrlTracker,RedirectHttpCode,icUrlTracker,RedirectPassThroughQueryString,icUrlTracker,Notes,icUrlTracker,Is404,icUrlTracker,Referrer,icUrlTracker,Inserted,icUrlTracker,ForceRedirect,UFWorkflowsToForms,Workflow,UFWorkflowsToForms,Form,UFSettings,Id,UFSettings,Key,UFSettings,Value,UFPrevalueSources,Id,UFPrevalueSources,Name,UFPrevalueSources,Type,UFUserSecurity,User,UFUserSecurity,ManageDataSources,UFUserSecurity,ManagePreValueSources,UFUserSecurity,ManageWorkflows,UFUserSecurity,ManageForms,UFDataSources,Id,UFDataSources,Type,UFDataSources,Name,UFFormStates,State,UFPrevalueSourceSettings,PrevalueProvider,UFPrevalueSourceSettings,Key,UFPrevalueSourceSettings,Value,UFDataSourceMappings,DataSource,UFDataSourceMappings,DataSourceField,UFDataSourceMappings,Form,UFDataSourceMappings,PrevalueTable,UFDataSourceMappings,PrevalueKeyField,UFDataSourceMappings,PrevalueValueField,UFDataSourceMappings,DataType,UFDataSourceMappings,DefaultValue,UFForms,Id,UFForms,Name,UFForms,Created,UFForms,ManualApproval,UFForms,GotoPageOnSubmit,UFForms,MessageOnSubmit,UFForms,DataSource,UFForms,ShowValidationSummary,UFForms,HideFieldValidation,UFForms,RequiredErrorMessage,UFForms,InvalidErrorMessage,UFForms,FieldIndicationType,UFForms,Indicator,UFForms,Archived,UFForms,StoreRecordsLocally,UFForms,DisableDefaultStylesheet,UFForms,Entries,UFForms,Views,UCUserSettings,User,UCUserSettings,Key,UCUserSettings,Value,UFWorkflowExecutionStates,Workflow,UFWorkflowExecutionStates,State,UFWorkflowExecutionStates,Form,UFWorkflows,Id,UFWorkflows,Name,UFWorkflows,Type,UFWorkflows,SortOrder,UFWorkflows,Active,UFWorkflows,Form,UFWorkflows,ExecutesOn,UFRecordsXml,id,UFRecordsXml,Form,UFRecordsXml,xml,UFRecordsXml,created,UFRecordsXml,Page,UFRecords,Id,UFRecords,Form,UFRecords,Created,UFRecords,Updated,UFRecords,State,UFRecords,currentPage,UFRecords,umbracoPageId,UFRecords,IP,UFRecords,MemberKey,UFUserFormSecurity,User,UFUserFormSecurity,Form,UFUserFormSecurity,HasAccess,UFUserFormSecurity,SecurityType,UFUserFormSecurity,AllowInEditor,UFPages,Id,UFPages,Form,UFPages,SortOrder,UFPages,Caption,UFRecordFields,Key,UFRecordFields,Field,UFRecordFields,Record,UFRecordFields,DataType,UFFieldsets,Id,UFFieldsets,Page,UFFieldsets,SortOrder,UFFieldsets,Caption,UFFields,Id,UFFields,Fieldset,UFFields,Fieldtype,UFFields,PreValueProvider,UFFields,RegEx,UFFields,Mandatory,UFFields,SortOrder,UFFields,Caption,UFFields,DataSourceField,UFFields,ToolTip,UFFields,DefaultValue,UFFields,RequiredErrorMessage,UFFields,InvalidErrorMessage,UFFieldSettings,Field,UFFieldSettings,Key,UFFieldSettings,Value,UFPrevalues,Id,UFPrevalues,Field,UFPrevalues,Value,UFPrevalues,SortOrder,UFRecordDataString,Id,UFRecordDataString,Key,UFRecordDataString,Value,UFRecordDataLongString,Id,UFRecordDataLongString,Key,UFRecordDataLongString,Value,UFRecordDataInteger,Id,UFRecordDataInteger,Key,UFRecordDataInteger,Value,UFRecordDataDateTime,Id,UFRecordDataDateTime,Key,UFRecordDataDateTime,Value,UFRecordDataBit,Id,UFRecordDataBit,Key,UFRecordDataBit,Value,UFFieldConditions,Id,UFFieldConditions,Field,UFFieldConditions,Enabled,UFFieldConditions,ActionType,UFFieldConditions,LogicType,UFFieldConditionRules,Id,UFFieldConditionRules,FieldCondition,UFFieldConditionRules,Field,UFFieldConditionRules,Operator,UFFieldConditionRules,Value,AllContentData,NodeId,AllContentData,NodeName,AllContentData,ContentTypeId,AllContentData,ContentTypeAlias,AllContentData,ContentTypeDisplayName,AllContentData,ParentId,AllContentData,Deleted,AllContentData,PropertyId,AllContentData,PropertyAlias,AllContentData,PropertyDisplayName,AllContentData,PropertyContentTypeId,AllContentData,PropertyContentTypeName,AllContentData,PropertyDataTypeId,AllContentData,PropertyDataTypeName,AllContentData,PropertyDataId,AllContentData,VersionId,AllContentData,dataNvarchar,AllContentData,dataNtext,AllContentData,dataDate,AllContentData,dataInt,vwCrmUfRecordFieldValues,FormId,vwCrmUfRecordFieldValues,FormName,vwCrmUfRecordFieldValues,RecordId,vwCrmUfRecordFieldValues,RecordDate,vwCrmUfRecordFieldValues,IpAddress,vwCrmUfRecordFieldValues,FieldName,vwCrmUfRecordFieldValues,StringValue,vwCrmUfRecordFieldValues,BitValue,vwCrmUfRecordFieldValues,DateTimeValue,vwCrmUfRecordFieldValues,IntegerValue,vwCrmUfRecordFieldValues,LongStringValue,vwCrmUfRecordFieldValues,FieldSortOrder,ConciergeLockUnLock,nodeId,ConciergeLockUnLock,userId,ConciergeLockUnLock,status,ConciergeLockUnLock,comment,ConciergeLockUnLock,DateStamp,ConciergeLockUnLock,ticketId

The following constraints (Primary Keys, Foreign Keys and Indexes) were found in the database, but are not in the current schema: FKUFDataSourceMappingsUFDataSources,FKUFDataSourceMappingsUFForms,FKUFFieldUFFieldsets,FKUFFieldConditionRulesUFFieldConditions,FKUFFieldConditionRulesUFFields,FKUFFieldConditionsUFFields,FKUFFieldsetsUFPages,FKUFFieldSettingsUFFields,FKUFFormsUFDataSources,FKUFPagesUFForms,FKUFPrevaluesUFFields,FKUFPrevalueSettingsUFPrevalueProviders,FKUFRecordDataBitUFRecordFields,FKUFRecordDataDateTimeUFRecordFields,FKUFRecordDataIntegerUFRecordFields,FKUFRecordDataLongStringUFRecordFields,FKUFRecordDataStringUFRecordFields,FKUFRecordFieldsUFFields,FKUFRecordFieldsUFRecords,FKUFRecordsUFForms,FKUFRecordsXmlUFForms,FKUFUserFormSecurityUFForms,FKUFWorkflowExecutionStatesUFFormStates,FKUFWorkflowsUFForms,PKcmsPreviewXml,PKConciergeLockUnLock,PKicUrlTracker,PKUCUserSettings,PKUFDataSourceMappings,PKUFDataSources,PKUFField,PKUFFieldConditionRules,PKUFFieldConditions,PKUFFieldsets,PKUFForms,PKUFFormStates,PKUFPages,PKUFPrevalueProviders,PKUFPrevalues,PKUFPrevalueSettings,PKUFRecordDataBit,PKUFRecordDataDateTime,PKUFRecordDataInteger,PKUFRecordDataLongString,PKUFRecordDataString,PKUFRecordFields,PKUFRecords,PKUFRecordsXml,PKUFSettings,PKUFUserFormSecurity,PKUFUserSecurity,PKUFWorkflowExecutionStates,PKUFWorkflows,PKUFWorkflowsToForms,PKcmsContentPreviewXml,IXumbracoNodeTrashed,IXumbracoNodeParentId,IXumbracoNodeObjectType,IXcmsTemplatenodeId,IXcmsContent,IXcmsContentVersionContentId,IXcmsContentVersionVersionId,IXcmsDocument,IXcmsDocumentpublished,IXcmsDocumentnewest,IXcmsContentType,IXcmsContentTypeicon,IXcmsDataTypenodeId,IXcmsDictionaryid,IXumbracoLanguagelanguageISOCode,IXumbracoLog,IXcmsPropertyData,IXcmsPropertyData1,IXcmsPropertyData2,IXcmsPropertyData3,IXumbracoUserLoginsIndex,IXumbracoUseruserLogin,IXcmsTaskTypealias,IXcomputerName,IXumbracoServerisActive

The following indexes were found in the database, but are not in the current schema: umbracoUserLoginsIndex,IXumbracoNodeTrashed,IXcmsContentVersionContentId,IXcmsDocumentpublished,IXcmsDocumentnewest,IXumbracoUserLoginsIndex

I also tried upgrading it to 6.25 directly and it gives the same error. Does anyone came across a similar error or can recommend a better approach to upgrade.

We are in the process of upgrading the site to Umbraco 7.32 but that is not ready to be tested yet and I need to fix this issue on live asap.