Merge pull request #10458 from Rik/disable-travis

Bug 884217 - Disable travis on v1.1.0hd r=yurenju(cherry picked from commit 48c005e720aaf810edc5d67ac2aa983dbbca47e1)
Merge pull request #9995 from cvan/marketplace-with-offline

update Marketplace packaged app with offline handler (bug 875849)(cherry picked from commit 1324eea22d3d850cd296c7330571315ab502331d)
[Bug 883510] Partner customization should be able to set Facebook OAuth 2 callback url completely