Merge pull request #757 from puppetlabs/revert-755-pdksync_heads/master-0-gfe44b98