Review 19874

C. Thomas Tyler
Defend against environment hijacking of P4ENVIRO and P4CONFIG.

Reviewers: Please see detailed discussion in job000548.
Tip: Use n and p to cycle through the changes.