SWITCHYARD-1382: Rules and BPM Variable Handling Fixes