Expand the joda.time import range
use block-write for bytes writing

Conflicts:
	rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ServletOutputStreamFilter.java
Add ability to set the synch timeout via a contextual property
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
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.
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
Move dependency-reduced-pom to target dir
Do a better job of trying to detect if a given commit has already been committed on the branch
Recording .gitmergeinfo Changes