CAMEL-6592 fixed the Javadoc issue of org.apache.camel.spi.ShutdownStrategy#setTimeout
Merge branch 'camel-2.10.x' of https://git-wip-us.apache.org/repos/asf/camel into camel-2.10.x