Replace guava 11 with 16 and extract Guava as a separate dependency.

Also, tidy up a teensy bit of test infrastructure, make sure OSGI test is excluded since it's designed for ant-only, and make maven tests fork, as they run out of permgen consistently. Lastly, make the build system enforce a 1.6 minimum, not a 1.5 minimum.
Add ignores for ant build spam.
Merge remote-tracking branch 'upstream/master'
Clean up leftovers from merge
Patch has been accepted upstream