Allows for the use or randome thin dirs, fix #16308
Merge branch '2014.7' into rand_thin

Conflicts:
	salt/client/ssh/__init__.py
Merge pull request #16641 from thatch45/rand_thin

Allows for the use or random thin dirs, fix #16308