Merge pull request #909 from puppetlabs/pdksync_IAC-215-3