SWITCHYARD-1384: Enhance WS-Security support