Fixup more warnings reported by IntelliJ

Change-Id: I210f7dc679c7d9ebbb6c07f2f662934010fda3e6
Reviewed-on: http://review.couchbase.org/27676
Tested-by: Trond Norbye <trond.norbye@gmail.com>
Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>