Also add a sanity check for the erroneous all-caps "TOKYO" that was
fixed in http://hg.mozilla.org/mozilla-central/rev/e85f83f352de

LGTM=dr.volker.dobler
R=dr.volker.dobler
CC=golang-codereviews
https://golang.org/cl/58890045