--When both discovery and collector are configured in config file, use the collector info from config file to connect to collector.
--Fix the above issue for control-node as well (when both discovery and collector are configured control-node was not connecting to collector)
(Fix for bug #1333645)
Change-Id: Icdbb7586d8965d8879490c334c977804f86f273f
Merge "--When both discovery and collector are configured in config file, use the collector info from config file to connect to collector. --Fix the above issue for control-node as well (when both discovery and collector are configured control-node was not connecting to collector) (Fix for bug #1333645) Change-Id: Icdbb7586d8965d8879490c334c977804f86f273f"