Use only one global var for marking config folder tree (#6610)

Use only one global var for marking config folder tree (#6610) #5609