Test history cleanup + fix for ACT-2095
Merge branch 'master' of https://github.com/Activiti/Activiti