Fix namespace IDs for canonical names

The IDs in the canonicalNamespaces object were strings for some strange reason,
so now we make sure they're Number instances before we store them.

Change-Id: Ie5ed2824e99f0252b8201ca549c4ca1e5890fe52
Merge "Fix namespace IDs for canonical names"