Use the user based thing dir for the states calls
Merge pull request #15528 from thatch45/thin_dir

Use the user based thin dir for the states calls