Fix issue of agent not connecting to collector when collector is configured in agent conf file. Change ID: I2d885864de4b5e6ead32cac209ccf4d74e19e7d9

Change-Id: Ie9c892fc3942f9d21038f50f97f3c505a8cb2c4d
Merge "Fix issue of agent not connecting to collector when collector is configured in agent conf file. Change ID: I2d885864de4b5e6ead32cac209ccf4d74e19e7d9"