Bug 1005594 - Make the wait for Marketplace content apply to packaged and unpackaged versions. r=wlachance