QA fix for mssql upgrade (tenant id failure)
Merge branch 'master' of https://github.com/Activiti/Activiti