Add missing solr-no-core.xml
Adding support for the addBeans method
merging upstream
[Spring Boot] Postponed routes injection to the bean post processing phase.
[Spring Boot] Added logging & JavaDoc.
[Spring Boot] Tuned configuration callback execution order.
Fixed the CS error of camel-solr
Removed the unused code of WebsocketSSLContextInUriRouteExampleTest
CAMEL-7940 Fixed the test error with JDK6 and do not set the enabledProtocols if specify the SslContextParameter
CAMEL-8003: Fix the broken camel-examples-etl.
CAMEL-6099: Fixing a unit test that expects a certain failure message for invalid chmod strings
CAMEL-7224 Fixed the camel-smpp fails to correctly send messages that require UCS-2 encoding with thanks to Daniel
CAMEL-7908 Add a DestinationCreationStrategy to the SJMS component with thanks to Aaron
CAMEL-7908 Fixed some CS errors of camel-sjms
Fixed the CS error of camel-jira
Fixed the CS error of camel-solr
CAMEL-8006 S3Producer should use File to upload directly
CAMEL-8006 Polished the code with suggestion of Claus
Merge branch 'master' into dpocock-smpp

Conflicts:
	components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSmCommand.java