Incorrect DNS conf file location causes DNS to fail for contrail discovery

[Nitish Krishna Kaveri]

Issue: File placed in incorrect location at: /etc/contrail/dns/control-dns.conf during SM provision
Should be at /etc/contrail/

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/15607
Submitter: Nitish Krishna Kaveri (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/15607
Committed: http://github.org/Juniper/contrail-puppet/commit/c4e5fc0890e4772e756497e733bf79430300276e
Submitter: Zuul
Branch: master

commit c4e5fc0890e4772e756497e733bf79430300276e
Author: nitishkrishna <email address hidden>
Date: Fri Dec 4 10:26:40 2015 -0800

Closes-Bug: #1522926 - Rectified contrail-dns.conf location

Discovery DNS was down as contrail-dns.conf was placed in /etc/contrail/dns instead of /etc/contrail

TESTING:
=========
1. provisioned 1 all-in-one node, verified that provision is completed
2. added image, created a network, subnetwork and 2 VMs, verified VMs are
active.
3. Logged-in to contrail-web ui and browsed to verify web-ui is up and
Running.
4. VMs are able to ping each other.
5. VM is able get http://169.254.269.254/openstack (metadata service)
6. Checked location of contrail-dns.conf.

Change-Id: I0d49926ff4a512b2ec4ee966c6c4d28f5941ed2b