SWITCHYARD-1382: BPM Variable Handling Fixes