Bug 24584: Rewrite optional/patron_categories to YAML