BZ-1007740: clear-up package creation/selection in new object creation
(cherry picked from commit 3c3129f8db00564bfda862a42cfa589021edaebc)