CBQE-0: upgradeXDCR, Some trivial fixes in online_upgrade

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