Merge pull request #4697 from danmcp/master

Merged by openshift-bot
Bug 1055456 - Handle node env messages better