CBQE-0: fix merging issue

Change-Id: Ib6780826f1617dceb35305b0091c49774adaa656
Reviewed-on: http://review.couchbase.org/41792
Reviewed-by: Iryna Mironava <irynamironava@yandex.ru>
Tested-by: Iryna Mironava <irynamironava@yandex.ru>