Merge pull request #496 from puppetlabs/allow-undef-content-conf