Revert "Revert "Set of BFQ improvements""

This reverts commit 85ae23f8e63003dabb351999cfb8cdc56ef82d7e.