Merge pull request #958 from puppetlabs/pdksync_bump_puppet7