Fix for #17051
Add regression test for #17051
Add "normalize_ret" function, so we don't have to copy/paste so much

Add checks for "changes" since we want to test cases where there aren't changes to be made
Merge pull request #17054 from jacksontj/2014.7

Fix for #17051