OpenStack Director tripleo configuration persists even if it is removed from templates

Issue

OpenStack Director tripleo configuration persists even if it is removed from the templates.

For example, in Red Hat OpenStack Platform, one can push the following, redundant configuration:

parameter_defaults:
  NovaSchedulerDefaultFilters: ['RamFilter','ComputeFilter','AvailabilityZoneFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','PciPassthroughFilter','NUMATopologyFilter','ServerGroupAntiAffinityFilter']

  ControllerExtraConfig:
    nova::scheduler::filter::scheduler_default_filters: ['RamFilter','ComputeFilter','AvailabilityZoneFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','PciPassthroughFilter','NUMATopologyFilter','ServerGroupAntiAffinityFilter']

Which changes the controller extra config in hiera to the same value as in service_configs.yaml (see below).

Then, on the next deployment, if ones comments:

parameters_defaults:
  NovaSchedulerDefaultFilters: ['RamFilter','ComputeFilter','AvailabilityZoneFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','PciPassthroughFilter','NUMATopologyFilter','ServerGroupAntiAffinityFilter']

  #ControllerExtraConfig:
  #  nova::scheduler::filter::scheduler_default_filters: ['RamFilter','ComputeFilter','AvailabilityZoneFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','PciPassthroughFilter','NUMATopologyFilter','ServerGroupAntiAffinityFilter']

Hieradata still contains the extra configuration:

[root@overcloud-controller-1 ~]# grep scheduler_default /etc/puppet/hieradata/* -R -A9
/etc/puppet/hieradata/controller_extraconfig.yaml:nova::scheduler::filter::scheduler_default_filters: [
/etc/puppet/hieradata/controller_extraconfig.yaml-  "RamFilter",
/etc/puppet/hieradata/controller_extraconfig.yaml-  "ComputeFilter",
/etc/puppet/hieradata/controller_extraconfig.yaml-  "AvailabilityZoneFilter",
/etc/puppet/hieradata/controller_extraconfig.yaml-  "ComputeCapabilitiesFilter",
/etc/puppet/hieradata/controller_extraconfig.yaml-  "ImagePropertiesFilter",
/etc/puppet/hieradata/controller_extraconfig.yaml-  "PciPassthroughFilter",
/etc/puppet/hieradata/controller_extraconfig.yaml-  "NUMATopologyFilter",
/etc/puppet/hieradata/controller_extraconfig.yaml-  "ServerGroupAntiAffinityFilter"
/etc/puppet/hieradata/controller_extraconfig.yaml-]
--
/etc/puppet/hieradata/service_configs.yaml:nova::scheduler::filter::scheduler_default_filters: [
/etc/puppet/hieradata/service_configs.yaml-  "RamFilter",
/etc/puppet/hieradata/service_configs.yaml-  "ComputeFilter",
/etc/puppet/hieradata/service_configs.yaml-  "AvailabilityZoneFilter",
/etc/puppet/hieradata/service_configs.yaml-  "ComputeCapabilitiesFilter",
/etc/puppet/hieradata/service_configs.yaml-  "ImagePropertiesFilter",
/etc/puppet/hieradata/service_configs.yaml-  "PciPassthroughFilter",
/etc/puppet/hieradata/service_configs.yaml-  "NUMATopologyFilter",
/etc/puppet/hieradata/service_configs.yaml-  "ServerGroupAntiAffinityFilter"
/etc/puppet/hieradata/service_configs.yaml-]

Meaning that if one adds controller extra config, then removes it from the templates, the values will still persist via the heat database.