Fix test failures after JBWS-3733 change and cxf/wss4j upgrade