Fixed #17906 - {% cycle %} and {% firstof %} templatetags in future with auto-escaping