Bug 832899.  Make sure our canonical isupports matches what various consumers expect.  r=smaug, a=bajaj