Merge pull request #798 from puppetlabs/pdksync_MODULES-6805