Merge "Env files for ODL deployments" into stable/pike