Merge branch 'release/3.4.0' into camel-karaf-3.4.x