Revert "Revert "Revert "Set of BFQ improvements"""

This reverts commit a4289565aa29a6c19b2d203592a092dfdcad1384.