Update envsetup.sh

Merge 4.2.2