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

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