Merge "docs: update userguide with merged plugins"

diff --cc docs/release/userguide/feature.userguide.rst
index 30e34b9,6c269b1..699412d
--- 1/docs/release/userguide/feature.userguide.rst
--- 2/docs/release/userguide/feature.userguide.rst
+++ b/docs/release/userguide/feature.userguide.rst
@@@ -1037,11 -1037,9 +1038,11 @@@ https://github.com/collectd/collectd/bl
  For more details on AgentX subagent, please see:
  http://www.net-snmp.org/tutorial/tutorial-5/toolkit/demon/
  
 +.. _virt-plugin:
 +
  virt plugin
  ^^^^^^^^^^^^
- Repo: https://github.com/maryamtahhan/collectd
+ Repo: https://github.com/collectd/collectd
  
  Branch: master
  
@@@ -1172,10 -1170,8 +1173,10 @@@ statistics are disabled. They can be en
      </Plugin>
  
  For more information on the plugin parameters, please see:
- https://github.com/maryamtahhan/collectd/blob/feat_libvirt_upstream/src/collectd.conf.pod
+ https://github.com/collectd/collectd/blob/master/src/collectd.conf.pod
  
 +.. _install-collectd-as-a-service:
 +
  Installing collectd as a service
  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  **NOTE**: In an OPNFV installation, collectd is installed and configured as a