fix up unmerged commit
block:bfq: fix up conflicts in previous commit and update bfq to v7r5
fix up conflicts