Merge pull request #806 from puppetlabs/pdksync_puppet_6_release_prep