Bug 1011016; new marketplace dev/stage packages
Merge pull request #21726 from ngokevin/master

Bug 1011016; new marketplace dev/stage packages