Bug 17871: (followup) Remove zebra::* from the packages templates