Fix some error messages where wsdl2java would just display FAIL_TO_CREATE_WSDL_DEFINITION instaead of the actuall problem.
Fix the printing of the suppressed exceptions on Java6
[CXF-5623] If a wsdl imports a schema directly using a wsdl:import instead of wsdl:types/xsd:schema/xsd:import, then try to detect that and use the appropriate schema systemId instead of a generated one.
Fix a test error message to reflect reality.

Conflicts:
	tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
Recording .gitmergeinfo Changes
Do not try to write twice to output stream in robust one-way
Recording .gitmergeinfo Changes
Update to allow specifying a single version to merge
Use patchId to figure out if we need to record the merge or not