Merge changes from topics 'YARDSTICK-1286', 'YARDSTICK-1127'
[yardstick.git] / yardstick / network_services / vnf_generic / __init__.py