Merge "Add name and description fields to plan-environment.yaml"