Merge pull request #800 from puppetlabs/pdksync_FM-7392_pdk_update