ACCUMULO-2125 upping guava
ACCUMULO-2165 temporary fix
ACCUMULO-2160 back-port serious findbugs/pmd issues to 1.5/1.4
Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
ACCUMULO-2168 log entry in zk is the last element of the file name
Merge branch '1.6.0-SNAPSHOT'