Fixed #22130 -- fixed template_tests/defaultfilters order dependent test failure
Merge pull request #2383 from erikr/fix-tests-fix-ampersands-deprecation

Fixed #22130 -- fixed template_tests/defaultfilters order dependent test failure