Fixes 5992 and 5993: Update puppet modules