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