Merge "Fixed unneeded wrapping of guava for karaf"