Sonar fixes for camel and guava