Bug 1086715 - make sure update dialogs still work without SHB
Merge pull request #25384 from mikehenrty/bug-1086715-swup-shb

Bug 1086715 - make sure update dialogs still work without SHB