fix data type in zone and service template, which broke formula for 2016.3

firewalld/services.sls

       - module: service_firewalld # restart service
     - context:
         name: {{ s_name }}
-        service: {{ v }}
+        service: {{ v|json }}
 
 {% endfor %}

firewalld/zones.sls

       - module: service_firewalld   # restart service
     - context:
         name: {{ z_name }}
-        zone: {{ v }}
+        zone: {{ v|json }}
 
 {% endfor %}