CM upgrade JodaTime & Guava