CBQE-927: minor changes

Change-Id: I7ba00fb2fb3586707f34ae7c91ab47f039bbb015
Reviewed-on: http://review.couchbase.org/23775
Reviewed-by: Andrei Baranouski <andrei.baranouski@gmail.com>
Tested-by: Andrei Baranouski <andrei.baranouski@gmail.com>