fix remove hash cache file error (cp from 0.17)
fix remove hash cache file error (cp from 0.17)

Conflicts:
	salt/fileserver/roots.py

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt