Unify the old (mace) and new workshop templates in a military_workshop one (no need to inherit from barracks).
As introduced by Lordgood, i've kept the possibility to garrison siege units in workshop, but limit its number to 2. And not done in this patch, we could also add an Aura to repair garrisoned siege (as done for ships in shipyard).