[CXF-5355] Making sure substitutions do not interfere with xsi:type

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