Fixup compile failure due merging to wrong branch

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