Merge "Fixes ODL environment files in THT"