Fix bad merge of ssl-observatory.js.

I reset ssl-observatory to 3.4.5, as it was on the stable branch (4.0), then
manually replayed the small number of tweaks from master:

22957062548a318ad57bc1e3b3eb7bece74735b6
92f45cf3bcd2211822439e46fe399b3f60c3944f
e6cd64ccbf4244ff0341841f09121cae5a39942e
5197662ba1060f40eddb803b61ea9363f4730ccd
68421bc71bc848ab103a5b1a74bd64fb83ddf283

We still need to restore the changes that were reverted when we went back to the
3.4.5 version of this file, per
https://github.com/EFForg/https-everywhere/issues/262
Merge pull request #818 from jsha/fix-ssl-observatory-merge

Fix bad merge of ssl-observatory.