Merge pull request #1030 from puppetlabs/pdksync_maint/pdk_update_20-04