CXF-4866, CXF-352: Restructure WS-RM to capture message in PRE_STREAM
phase, begin retransmission from same point so that WS-Security and
other add-ons will function correctly.

git-svn-id: https://svn.apache.org/repos/asf/cxf/trunk@1566560 13f79535-47bb-0310-9956-ffa450edef68
Correct for merge errors.

git-svn-id: https://svn.apache.org/repos/asf/cxf/trunk@1566561 13f79535-47bb-0310-9956-ffa450edef68