OTR fixes

* Revert unneeded "fix" to fingerprint handling
* Lock OTR conversations to presence (fixed regression)
* Sync guava version with cacheword (fixes build)
* Use full JID to keep track of remote pubkeys