Merge remote-tracking branch 'puppetlabs/release'

This is a manual merge-back of the release branch from 10.5.0, which
was accidentally merged using a squash-merge.

Author: DavidS