Merge pull request #790 from puppetlabs/pdksync_pdksync-beaker4