Merge "Bug 1921: Remove override of guava version in features/"