Finalize Camel CDI section and move it to the end
Fix formatting in Metrics CDI section