Read Pillar files into OrderedDict to preserve source order
Merge pull request #17284 from smoothify/develop

Read Pillar files into OrderedDict to preserve source order