Merge pull request #936 from puppetlabs/pdksync_IAC-746