Merge pull request #750 from phil-davis/RELENG_2_1
Reorder reverse lookup overrides so user-specified ones are effective 2.1
Merge pull request #750 from phil-davis/RELENG_2_1
Reorder reverse lookup overrides so user-specified ones are effective 2.1