Merge r1879878 from trunk: Avoid NULL pointer dereferences for empty environment variable values Submitted by: rpluem Reviewed by: jailletc36, covener, gbechis, jim