[CXF-4910]:Refactor to better support more relative import path
Fixing some CRL tests with JDK 8
Recording .gitmergeinfo Changes
Add mapped paths
Add ability to set the synch timeout via a contextual property
Recording .gitmergeinfo Changes
Add an "advanced merge" option that will try and take any remapped paths into account
If git cherry-pick doesn't have a conflict, we dont need to "record" the merge as "git cherry" will detect it
[CXF-5628] Fixes to Base64URLUtility and HmacUtils
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
Simplify expression and make PMD happy
Recording .gitmergeinfo Changes
Adjust Message property updates for 2.7.x branch