Upgrade to guava 15-RC1 and easymock 3.2