[Bug 832737] Dedup clouds/installed apps  [r=crdlc]
Merge pull request #7693 from EverythingMe/dedup-installed-clouds

[Bug 832737] Dedup clouds/installed apps [r=crdlc]
Bug 826623 - Step indicator shows incorrect steps