Merge "fix uses of grep in envsetup.h" into klp-dev