Merge "Add the missing env varialbes for e2term"