Merge remote-tracking branch 'upstream/master'
 add test case for act-1026
add test cases for act-1026
stage 1 act-1026
stage 2 act-1026
merged pull request act-1026
Merge branch 'master' of https://github.com/Activiti/Activiti