MB-5203 Include diag in collect_info
MB-5203 Include diag in collect_info

Also, get rid of cbupgrade dependency.

Change-Id: I77046d30aaadbf8e7cbc8f21feb22cd0bb405490
Reviewed-on: http://review.couchbase.org/16614
Tested-by: Bin Cui <ed18693fff32c00e22495f4877a3b901bed09041@gmail.com>
Reviewed-by: Aliaksey Kandratsenka <340b8e09ca65cd3fc686427fcfed17e87eaf61e2@gmail.com>

t3rm1n4l/ns_server,membase/ns_server,nimishzynga/ns_server,ceejatec/ns_server,pavel-blagodov/ns_server,t3rm1n4l/ns_server,ceejatec/ns_server,mschoch/ns_server,daverigby/ns_server,daverigby/ns_server,daverigby/ns_server,vzasade/ns_server,pavel-blagodov/ns_server,nimishzynga/ns_server,ceejatec/ns_server,daverigby/ns_server,mschoch/ns_server,nimishzynga/ns_server,ceejatec/ns_server,pavel-blagodov/ns_server,t3rm1n4l/ns_server,membase/ns_server,t3rm1n4l/ns_server,vzasade/ns_server,nimishzynga/ns_server,membase/ns_server,membase/ns_server,nimishzynga/ns_server,daverigby/ns_server,membase/ns_server,mschoch/ns_server,ceejatec/ns_server,mschoch/ns_server,vzasade/ns_server,vzasade/ns_server,t3rm1n4l/ns_server,membase/ns_server,pavel-blagodov/ns_server,nimishzynga/ns_server,ceejatec/ns_server,mschoch/ns_server,mschoch/ns_server