Merge "Consistent hostname format env for split-stack"