28395 route bugs

@texasag @tsanko @kevinsproles This is the toolbox fix for Bug 28395. There is a sister commit in the toolbox. Please move TP story to Test once code review is complete on both and changes merged into master.