saltstack/salt — pull request #7741 by dlanderson (2013-10-10 21:13:02+00:00)
Title: Restore the pillar[master][file_roots] when returning the pillar

Fixes https://github.com/saltstack/salt/issues/5449