openstack overcloud upgrade run fails on Collectd_plugin ovs_stats declared twice

Issue

• Unable to complete the fast forward upgrade from RHOSP13 to RHOSP16

• This error can be seen in the execution logs

+ /usr/bin/puppet apply --summarize --detailed-exitcodes --color=false --modulepath=/etc/puppet/modules:/usr/share/openstack-puppet/modules --tags '\"file,file_line,concat,augeas,cron,collectd_client_config,exec\"' /etc/config.pp
 + logger -s -t puppet-user
<13>Jun 28 17:38:40 puppet-user: Warning: /etc/puppet/hiera.yaml: Use of 'hiera.yaml' version 3 is deprecated. It should be converted to version 5
<13>Jun 28 17:38:42 puppet-user:    (file: /etc/puppet/hiera.yaml)
<13>Jun 28 17:38:42 puppet-user: Warning: Undefined variable '::deploy_config_name'; \
   (file & line not available)
<13>Jun 28 17:38:42 puppet-user: Warning: ModuleLoader: module 'tripleo' has unresolved dependencies - it will only see those that are resolved. Use 'puppet module list --tree' to see information about modules\
   (file & line not available)
<13>Jun 28 17:38:42 puppet-user: Warning: The function 'hiera' is deprecated in favor of using 'lookup'. See https://puppet.com/docs/puppet/5.5/deprecated_language.html\
   (file & line not available)
<13>Jun 28 17:38:42 puppet-user: Warning: ModuleLoader: module 'collectd' has unresolved dependencies - it will only see those that are resolved. Use 'puppet module list --tree' to see information about modules\
   (file & line not available)
<13>Jun 28 17:38:42 puppet-user: Warning: ModuleLoader: module 'concat' has unresolved dependencies - it will only see those that are resolved. Use 'puppet module list --tree' to see information about modules\
   (file & line not available)
<13>Jun 28 17:38:43 puppet-user: Error: Evaluation Error: Error while evaluating a Resource Statement, Evaluation Error: Error while evaluating a Resource Statement, Duplicate declaration: Tripleo::Profile::Base::Metrics::Collectd::Collectd_plugin[ovs_stats] is already declared at (file: /etc/puppet/modules/tripleo/manifests/profile/base/metrics/collectd/collectd_service.pp, line: 8); cannot redeclare (file: /etc/puppet/modules/tripleo/manifests/profile/base/metrics/collectd/collectd_service.pp, line: 8) (file: /etc/puppet/modules/tripleo/manifests/profile/base/metrics/collectd/collectd_service.pp, line: 8, column: 5) (file: /etc/puppet/modules/tripleo/manifests/profile/base/metrics/collectd.pp, line: 301) on node