SWITCHYARD-2426 - Fixing the CXF binding as well as the Mail binding

which I found had some minor layout issues as well