merge 935934 from trunk - ARIES-296 Ensure samples set system packages to avoid wiring to system bundle transaction packages