puppet: fixes and backported from Linux 2.90 stream