ake module id of discovery server and dns agent consistent:
a) Change DnsAgent to contrail-dns
b) Change contrail-discovery:0 to contrail-discovery

Change-Id: I7d48e07e08c0b8e98e658359aee2d7ba53890793
Closes-PR: 1383577