bfq-3.13: merge BFQv7r2
Merge branch 'bfq-3.13' into pf-3.13