kernel: merge a pending fix for HFSC warnings/slowdowns (fixes FS#1136)