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

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