Merge "Not to pass the engine param if present"

salt/files/_engine.conf

@@ -2,5 +2,7 @@
 
 engines:
 {%- for engine_name, engine in master.engine.items() %}
-- {{ engine.get('engine', engine_name) }}: {{ engine|yaml }}
+{%- set name = engine.get('engine', engine_name) %}
+{%- if engine.engine is defined %}{%- do engine.pop('engine') %}{% endif %}
+- {{ name }}: {{ engine|yaml }}
 {%- endfor %}