SWITCHYARD-1574 API cleanup
SWITCHYARD-1579: BPM Component correlationKey issues