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