Bug 999110 - warning about no shutdown method in bootstrap.js for browser-helper
Bug 975535 - marketplace update to include latest icons
Bug 993273 - Ensure FxA dialog is created hidden
Merge pull request #18570 from timdream/fix-trust-ui-fxa2

Bug 993273 - Ensure FxA dialog is created hidden, r=alive
Merge pull request #18497 from autonome/helper-shutdown

Bug 999110 - warning about no shutdown method in bootstrap.js for browse...
Revert "Bug 999553 - Reenable most disabled unit tests on TBPL r=jgriffin" for render_test.js failures

This reverts commit ce1c1dee95a284d7dcc06862895108180168c08d.
Merge pull request #18551 from mikehenrty/bug-975535-marketplace

Bug 975535 - marketplace update to include latest icons, r=julienw
Bug 931119 - [SMS] Localize labels in thread header, don't hardcode separator character

* Use localizable string to position elements
* Don't hardcode separator characters (' | ', ', ')
* Add 2 tests (different separator characters, fallback for empty separators)