Jbpm 3913/3785 (rebase on top of temp-branch/jbpm-4015 fixes)

Hi Maciej, 

The commits that affect your work are the last two (e6e86a2 and c17ce48) and 371d9cf. I think the rest don't affect anything you do. 

Let me know next week if you have any questions. Starting the 1rst of June, I'll be on vacation for 3 weeks and only checking my mail sometimes. 

Thanks!
Marco