Merge "Do not start collectd twice when SampleVNF is running on Baremetal" into stabl...