Revert "CBQE-0: revert changes from http://review.couchbase.org/#/c/33878/ causing upgradeXDCR test to stuck"

This reverts commit af515f4ddcbce4668cf77809ee84d5b42ee01919.

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