Merge pull request #8973 from cvan/packaged-marketplace

Bug 856799 - Make Marketplace a packaged app(cherry picked from commit 9b1fa182e4ac13643326394efeda26e7d4e98145)

Conflicts:
	external-apps/marketplace.firefox.com/update.webapp