Merge pull request #482 from remichristiaan/restart_master_minion_last

fix(service): service salt-master and salt-minion to restart last

salt/master.sls

@@ -61,6 +61,7 @@ salt-master:
       - file: salt-master
            {%- endif %}
       - file: remove-old-master-conf-file
+    - order: last
     {% endif %}
     {% if salt_settings.master_remove_config %}
 remove-default-master-conf-file:

salt/minion.sls

@@ -107,6 +107,7 @@ salt-minion:
     - name: {{ salt_settings.minion_service }}
     - watch:
       - file: remove-old-minion-conf-file
+    - order: last
     {% endif %}
     {%- if not salt_settings.restart_via_at %}
   cmd.run: