Merge changes from topic 'YARDSTICK-1116'
[yardstick.git] / yardstick / network_services / __init__.py