Merge pull request #9295 from ctiller/oh_sanity_my_sanity

Always sort code generated outputs