Get the exclusion in the right place for guava.
Merge remote-tracking branch 'origin/master'