Making SWF and shield mastery mutally-exclusive is just ridiculous.
And claiming that doing so now is a bug, is also ridiculous. No where does it say that you can't have both.
Shield mastery is it's own thing, unrelated to these weapon lines.
If SWF and shield mastery are "fixed", then I would expect to see dwarven axes and bastard swords also get a similar treatment for THF and shield mastery. And I don't want that either. But logically you can't do one without the other.
Otherwise it is just a blatant bard nerf, right after bard gets some love. And while swashbucklers are good, I don't think the argument that they are OP and need a nerf is much of an argument.