Merge pull request #9995 from cvan/marketplace-with-offline

update Marketplace packaged app with offline handler (bug 875849)(cherry picked from commit 1324eea22d3d850cd296c7330571315ab502331d)