SWITCHYARD-2353 - Updates to rules & bpm models