Merge pull request #2836 from fermga/copilot/update-canonical-grammar-to-unified

[Grammar] Phase 2.2: Refactor canonical_grammar.py to delegate to unified_grammar

Author: fermga