Merge pull request #1117 from puppetlabs/MAINT_sync_changelog_changes