Disabled policy versions

Changelog: Disabled policy version in masterfiles because it is now managed and inventoried by default by the core agent inside sys.policy_version.
Ticket: ENT-4043
Signed-off-by: Victor Moene <victor.moene@northern.tech>

Author: victormlg

controls/def.cf

@@ -871,6 +871,8 @@ bundle common inventory_control
       "disable_inventory_proc" expression => "disable_inventory|freebsd";
       "disable_inventory_proc" not => isdir($(proc));
 
+      "disable_mpf_policy_version" expression => isvariable("$(sys.policy_version)");
+
   reports:
     verbose_mode.disable_inventory::
       "$(this.bundle): All inventory modules disabled";

inventory/any.cf

@@ -16,9 +16,10 @@ bundle common inventory_any
         string => "$(data[releaseId])",
         meta => { "inventory", "attribute_name=Policy Release Id" };
 
-      "policy_version" -> { "ENT-9806" }
-        string => "$(default:control_common.version)",
-        meta => { "inventory", "attribute_name=CFEngine policy version" };
+      disable_mpf_policy_version::
+        "policy_version" -> { "ENT-9806" }
+          string => "$(default:control_common.version)",
+          meta => { "inventory", "attribute_name=CFEngine policy version" };
 
   reports:
       "DEBUG|DEBUG_$(this.bundle)"::