Clean up salt raet routing logic in prep for unique naming versus roles
Merge pull request #16043 from SmithSamuelM/2014.7_sam4

Clean up salt raet routing logic in prep for unique naming versus roles