Bug 1011016; new marketplace dev/stage packages
Merge pull request #21723 from ngokevin/1011016v2.0

Bug 1011016; new marketplace dev/stage packages