Restore configuration to as close to the original state as possible about puppetlabs-cve20113872

[jeffmccune]

As part of this issue, we should also clean up the comments we're currently leaving behind in all of the configuration files.

The consensus from the demo today was that a single comment mentioning the migration has completed will be sufficient.

My notes are:
Clean up the comments in the configuration file (recommendation, only one comment with the step we've completed through…)

    # CVE-2011-3872 Fix (Was: /etc/puppetlabs/puppet/ssl/certs/puppetmaster.pem)
    SSLCertificateFile      /etc/puppetlabs/puppet/ssl/certs/puppetmaster.pem
    # CVE-2011-3872 Fix (Was: /etc/puppetlabs/puppet/ssl/private_keys/puppetmaster.pem)
    SSLCertificateKeyFile   /etc/puppetlabs/puppet/ssl/private_keys/puppetmaster.pem
    # CVE-2011-3872 Fix (Was: /etc/puppetlabs/puppet/ssl/certs/ca.pem)
    SSLCertificateChainFile /etc/puppetlabs/puppet/ssl/certs/ca_bundle.pem
    # CVE-2011-3872 Fix (Was: /etc/puppetlabs/puppet/ssl/certs/ca.pem)
    SSLCACertificateFile    /etc/puppetlabs/puppet/ssl/certs/ca_bundle.pem
    # CRL checking should be enabled; if you have problems with Apache complaining about the CRL, disable the next line

[jeffmccune]

We're no longer modifying apache's configuration and site.pp is being restored to the original state in step 5. Agents are also switching back to their original DNS name in step 4.