Merge changes from topic '35521'
[yardstick.git] / yardstick / network_services / collector / __init__.py