Update versions for maven.
Some cleanup and removing guava-jdk5 from being pulled in by dependencies.

Revision created by MOE tool push_codebase.
MOE_MIGRATION=7112