Issue: When both discovery IP and service IP is configured in contrail-vrouter-agent.conf, the expected_connections count (used by NodeStatus UVE to declare whether agent is Functional or not) computed by agent was incorrect.
Fix: While updating expected_connections count we should consider whether agent has subscribed for a given discovery service or not.
Closes-Bug: #1396164

Change-Id: I93837ea036276580c55903f7b2d8e36bbd66ca7d