Moved to Marshal Questions forum and locked as answered.
[EDIT: The correct answer is that Weapon Master counts as a single skill and will get you one starting weapon, regardless of type. A style skill (Florentine/Two Weapons/Shield/Style Master) would allow you to select an additional relevant weapon/shield.
The incorrect information has been removed. Order has been restored.]