SWITCHYARD-1748 - Updates for BPMN2 Modeler refactoring