CXF-4866, CXF-352: Fixes to restructured WS-RM code from problems found with unit tests, and corrected unit tests to work with the restructured code.