Merge "minion.conf: Accept tcp_keepalive* properties"

salt/files/minion.conf

@@ -26,7 +26,11 @@ id: {{ minion.id | default(system.name~"."~system.domain) }}
   'max_event_size',
   'random_reauth_delay',
   'recon_default',
-  'recon_max'
+  'recon_max',
+  'tcp_keepalive',
+  'tcp_keepalive_cnt',
+  'tcp_keepalive_idle',
+  'tcp_keepalive_intvl'
 ] %}
 {%- for opt in opt_list %}
 {%- if minion.get(opt) %}