fix(engine): add activity instance id to variable instances

- fixes issues with matching variables to activity instances

related to CAM-982
Merge branch 'master' of github.com:camunda/camunda-bpm-platform