Merge pull request #952 from puppetlabs/pdksync_gitpod