CBQE-0: Applying the patch again http://review.couchbase.org/#/c/31617/

Change-Id: I770fa2f012c99898758dc9b8c8e7afa00402fe2d
Reviewed-on: http://review.couchbase.org/31651
Reviewed-by: Sangharsh Agarwal <sangharsh.agarwal@globallogic.com>
Tested-by: Sangharsh Agarwal <sangharsh.agarwal@globallogic.com>