Polish shutdown code Conflicts: camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java