Update dependencies, except Google guava

Updating the Google guava dependency to the latest version (16.0) from
the current version (r9) is a multi-year step in versions and breaks
tests.
Merge branch 'master-update-dependencies' into master-work