fix(coderd/database): sort template version variables and fix test flake#21233

mafredri merged 2 commits intomaincoder/coder:mainfrom

mafredri/test-fix-testtemplatepush-ctxcoder/coder:mafredri/test-fix-testtemplatepush-ctxCopy head branch name to clipboard