Merge pull request #5528 from cb1kenobi/3_2_X_hybrid

Fixed accidental change of scons package.py during TIMOB-16672.