Bug 1083197 - remove NULL's from environment variables
Merge pull request #5380 from jwhonce/bug/1093197

Merged by openshift-bot