CONN-1196:Addressing PR comments for Apache Camel Removal