Puppet certname change for labs

certname in labs is based on the dns entry for puppet hosts in LDAP
but we've now switched the dc entry to the fqdn. This change just
uses the dc directly, rather than appending the domain onto it.

Change-Id: Ib1f41af8faa745f9555d6fde6099f94877409944
Merge "Puppet certname change for labs" into production