Merge pull request #13939 from flodolo/bug941901

Bug 941901 - [settings] Use correct entity name for Cell broadcast r=crh0716(cherry picked from commit e42fdf6a6b77038b0a2cd46b9193378d84794c20)

Conflicts:
	apps/settings/elements/messaging.html