Squashed update of BFQ-v6r1 to BFQ-v6r2

Conflicts:

	block/bfq-ioc.c
	block/bfq-iosched.c