ACCUMULO-2125 - bumping up guava
ACCUMULO-2160 fixed up a lot of findbugs/pmd complaints
Merge branch '1.6.0-SNAPSHOT'

Conflicts:
	core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java