SWITCHYARD-2123 - Fixing issue with changing BPEL implementation