iosched: CFQ fixes and BFQ update to v6