Merge pull request #862 from puppetlabs/pdksync_pdksync_heads/master-0-g7827fc2