Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy

diff --cc policy/modules/services/cron.if
index ac895874158aa9d4e74a5b771985778167501b90,28f0e7cb2016e8eafa99ae00ed3bf8b04b924b30..d9727676b3350bb6578335f9cf40fb4b32f8e8c1
--- 1/policy/modules/services/cron.if
--- 2/policy/modules/services/cron.if
+++ b/policy/modules/services/cron.if
@@@ -339,9 -339,9 +339,9 @@@ interface(`cron_initrc_domtrans',
  ##    </summary>
  ## </param>
  #
 -interface(`crond_systemctl',`
 +interface(`cron_systemctl',`
        gen_require(`
-               type crond_unit_t;
+               type crond_unit_file_t;
                type crond_t;
        ')
  

diff --cc policy/modules/services/networkmanager.if
index af5a49894a62e1062e538b952f5765c2c6db76bc,b483979d6208c69256f3220cc853ed6637a2c92d..ac2e77968fe3d8d5cec264222d0379ac5e7c7759
--- 1/policy/modules/services/networkmanager.if
--- 2/policy/modules/services/networkmanager.if
+++ b/policy/modules/services/networkmanager.if
@@@ -124,9 -124,9 +124,9 @@@ interface(`networkmanager_initrc_domtra
  ##    </summary>
  ## </param>
  #
 -interface(`NetworkManager_systemctl',`
 +interface(`networkmanager_systemctl',`
        gen_require(`
-               type NetworkManager_unit_t;
+               type NetworkManager_unit_file_t;
                type NetworkManager_t;
        ')