SWITCHYARD-1579: BPM Component correlationKey issues