treewide: improve template expansion

also: support *.toml as extra configuration dictionaries

angie/snip/scgi-request-headers.j2

@@ -1,6 +1,5 @@
 ## sourced by conf/scgi/headers.conf
 ## set/remove request headers
-{%- set req_hdr_dict = j2cfg.request_headers or {} -%}
-{%- for h, v in req_hdr_dict|dictsort %}
-scgi_param  {{ h | as_cgi_hdr }}  {{ v | ngx_esc }};
+{%- for h, v in j2cfg.request_headers | cgi_header | dictsort %}
+scgi_param  {{ h }}  {{ v | ngx_esc }};
 {%- endfor %}