fixes #18632 (os.path.expanduser does not expand quoted paths)
make a functional equivalent patch to fix #18632
Merge branch '2014.7' of https://github.com/saltstack/salt into 2014.7
Merge pull request #18657 from wuxxin/2014.7

2014.7: fix for #18632