prepare 1.1.5

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