Revert "[MB-19395] - Address cbcollect_info failure on non data service node"
Revert "[MB-19395] - Address cbcollect_info failure on non data service node"

Reverting since this breaks cbcollect_info in a different way.

This reverts commit 9f5d4bf41e0787b8e63a2841550cab39b96bc93b.

Change-Id: I82082206f8520f3fb10510253210639215126e3e
Reviewed-on: http://review.couchbase.org/63729
Reviewed-by: Aliaksey Artamonau <3c875bcfb3adf2a65b2ae7686ca921e6c9433147@gmail.com>
Tested-by: Aliaksey Artamonau <3c875bcfb3adf2a65b2ae7686ca921e6c9433147@gmail.com>

membase/ns_server,ceejatec/ns_server,ceejatec/ns_server,ceejatec/ns_server,ceejatec/ns_server,membase/ns_server,membase/ns_server,membase/ns_server,membase/ns_server,ceejatec/ns_server,membase/ns_server,ceejatec/ns_server