[CAMEL-7306]: key is optional. Avoid NPE
[Minor] Organize imports to reduce warnings

Signed-off-by: Gregor Zurowski <gregor@zurowski.org>
CAMEL-7398: camel-salesforce - Fixed missing token_type field in Salesforce login call
CAMEL-7399: camel-salesforce - Fixed alias caching for updated XStream
CAMEL-7404 Zip Aggregation Strategy preserves folder structure with thanks to Matt
Upgraded netty
CAMEL-7406: Avoid NPE when password empty in JCR endpoint URI

Signed-off-by: Gregor Zurowski <gregor@zurowski.org>
CAMEL-7405: Fixed camel-aws feature
Added JmsConstants.JMS_X_GROUP_ID constant.
Merge branch 'CAMEL-7406' of https://github.com/gzurowski/camel
Merge branch 'CamelJcrTestCleanup' of https://github.com/gzurowski/camel
Added the holder of soap header unit test into camel-cxf module
Upgrade to deltaspike 0.7
Upgraded MyBatis
Merge branch 'CAMEL-7306' of https://github.com/grgrzybek/camel
CAMEL-7409 Camel ZipIterator should not eat up the IOException
Remove the Sytem.out line of AggregationStrategyWithPreservationTest
CAMEL-7225 camel-smpp - should check Exchange.CHARSET_NAME header with thanks to Radsaggi
Upgraded groovy
CAMEL-7415 fixed the issue that lazyLoad with CSV blows up on last line