Bug 1011016; new marketplace dev/stage packages
Merge pull request #21722 from ngokevin/1011016v1.4

Bug 1011016; new marketplace dev/stage packages