Restore the pillar[master][file_roots] when returning the pillar
Merge pull request #7741 from dlanderson/fix_issue_5449

Restore the pillar[master][file_roots] when returning the pillar