respect origin for fxa popup msg properly (bug 1055742)
upstream better comments
Change editorial brand names to provide better defaults and to prevent current and future string collisions (bug 1055851)