SWITCHYARD-1748 - Updates for BPMN2 Modeler refactoring

This change has to happen AFTER Bob gets a version of the BPMN2 Modeler into JBTIS that includes the breaking changes. But it should be good to go.