Config resoution order correction and documentation.
Minor existing typo fix.
Merge pull request #6021 from risaacson/issue_5359_2

Config resoution order correction and documentation.