Replace obsolete Guava with Java 8 where possible.

(Along the way I did some global find & replaces, and had to organize
imports project wide, hence the big diff...)