addresses #5020 by merging upstream puppet module changes