Bug 1030094 - Block simlock UI and FXA UI on l10n being ready
Bug 1027935 - Correctly handle pending upgrades as well as pause/resume of
upgrade downloads r=kgrandon
Bug 1027708 - Delay setting the collection datastore listeners until the datastore initial read r=kgrandon
Revert "Bug 1027708 - Disable test_cleanup_gaia for mac r=me"

This reverts commit f8fa13796f95e57e814bf5e72fce73f2aecb67f4.
Merge pull request #21088 from KevinGrandon/lightsofapollo-bug-1027935

Bug 1027935 - Correctly handle pending upgrades as well as pause/resume of upgrade downloads
Merge pull request #20987 from zbraniecki/1030094-block-systemdialog-on-l10n

Bug 1030094 - Block SIMLock UI and FXA UI on l10n being ready. r=ianliu
Merge pull request #21121 from KevinGrandon/AntonioMA-bug1027708_3

Bug 1027708 - Delay setting the collection datastore listeners until the datastore initial read