Merge branch 'wait' into bpmn

BPMN2: jenkins dependencies