zen-tune: Mask some options incompatible with BFS
Merge branch '3.10/zen-tune' into 3.10/master