Tos pp polish train 06 19

These patches were reviewed and r+ by @jedp in [3580](https://github.com/mozilla/browserid/pull/3580).