Merge pull request #518 from ze42/sorted_extra_options

fix: sort extra options in configuration

salt/files/master.d/f_defaults.conf

 {% endif %}
 {%- endif %}
 
-{%- for configname in cfg_master %}
+{%- for configname in cfg_master|sort %}
 {%- if configname not in reserved_keys and configname not in default_keys %}
 {{ configname }}:
   {{ cfg_master[configname]| yaml(False) | indent(2) }}

salt/files/minion.d/f_defaults.conf

 {% endif %}
 {%- endif %}
 
-{%- for configname in cfg_minion %}
+{%- for configname in cfg_minion|sort %}
 {%- if configname not in reserved_keys and configname not in default_keys %}
   {%- if cfg_minion[configname] is iterable and cfg_minion[configname] is not mapping and cfg_minion[configname] is not string %}
 {{ configname }}: