fix(apache.service.running): further improve circular requisites

This is a follow-on to PR saltstack-formulas#388:
- When the main Apache config file changes, reload Apache
- Installing modules only needs the module dir to exist, it doesn't need the
  entire config. Tightening up this requisite avoids potential circular
  dependencies.

Author: dehnert

apache/config/file.sls

@@ -97,6 +97,8 @@ apache-config-file-managed:
       - sls: {{ sls_package_install }}
     - context:
         apache: {{ apache | json }}
+    - watch_in:
+      - service: apache-service-running
 
   {%- if grains.os_family in ('Debian', 'FreeBSD') %}
 

apache/config/modules/install.sls

@@ -41,7 +41,7 @@ apache-config-modules-{{ module }}-enable:
         {%- endif %}
     - order: 225
     - require:
-      - sls: {{ sls_config_file }}
+      - file: apache-config-file-directory-moddir
     - watch_in:
       - module: apache-service-running-restart
     - require_in: