Use salt.utils.odict instead of python2.7 OrderedDict
Merge pull request #15113 from rallytime/remove_OrderedDict

Use salt.utils.odict instead of python2.7 OrderedDict