made environment variable names more specific
Authored by: andy_rushton 2017-03-22
Parent: [r98]
Child: [r100]