Fix issue 5951 - correct __opts__['file_roots'] in ext_pillars
Merge pull request #7767 from dlanderson/fix_issue_5951

Fix issue 5951 - correct __opts__['file_roots'] in ext_pillars