Updates generated from intellij

Change-Id: I670f8e4a4a0fb6b1546af8f9c731fb4094f81e77
Reviewed-on: http://review.couchbase.org/29147
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>