block: Squashed update of BFQ-v5r1 to BFQ-v6

Change-Id: I154b97051e3d28f4c9ef32ea1102baad19248c60