BPMN2 Modifications

BPMN2 Modifications
polszewski merge
Merge remote-tracking branch 'remotes/kkolodziej/RELEASE-2.1-BPMN' into RELEASE-2.1-JSP
redundant files removed
test fix