SWITCHYARD-1521 Update Rules & BPM Models

https://issues.jboss.org/browse/SWITCHYARD-1521