block: Merge BFQ updates to blk-cgroup

* For whatever reason the patch doesn't touch this file but this is different too

Signed-off-by: Chet Kener <Cl3Kener@gmail.com>