ACT-1860: fix for DB2 part 2
Merge branch 'master' of https://github.com/Activiti/Activiti