CBQE-0: corrected indentation in xdcr ugrade conf file and trivial fixes

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