Bug 1007369; New Marketplace package
Merge pull request #19087 from clouserw/mkt-20140508

Bug 1007369; New Marketplace package, r=timdream