Issue 3413 b2g tos pp

@jedp - can you review this PR? This builds on #3408, so we should get that out of the way first.

The ephemeral instance with this PR combined with #3408 is tos-pp.personatest.org

fixes #3413