Merge pull request #1035 from puppetlabs/Release_prep-v8.4.0