CAM-592 Bugfix: ACT-1026, ACT-1204

Inclusive gateway isn't properly joining sequence flows coming from call activities
InclusiveGateway with two subprocesses does not join correctly
Merge branch 'origin/master'