CAMEL-6964: Fixed file consumer on rollback to delete the done file if moveFailed is in use. Thanks to Christoph Giera for patch.

Conflicts:
	camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java
CAMEL-6962 Allow binding name to be specified in JibxDataFormat with thanks to Peter