Merge branch 'master' into use_lookup_map.jinja

salt/files/master.d/_defaults.conf

@@ -944,5 +944,11 @@ halite:
 rest_cherrypy:
   {% for name, value in cfg_master['rest_cherrypy'].items() %}
   {{ name }}: {{ value }}
-  {% endfor %}
+  {%- endfor %}
+{%- endif %}
+
+{% if 'presence_events' in cfg_master %}
+#####        presence events         #####
+##########################################
+{{ get_config('presence_events', 'False') }}
 {% endif %}