Merge branch 'hotfix/increment_sql_versions'
DF#QCADOOCLS-2006 productionCounting: fix problem with locked ribbon
Merge branch 'hotfix/mixpanel_typeErrors' into dev