SWITCHYARD-1922 - Making sure the model update is wrapped to avoid the
exception.
SWITCHYARD-2426 - Fixing the CXF binding as well as the Mail binding
which I found had some minor layout issues as well