Merge changes from topics 'YARDSTICK-1351', 'YARDSTICK-1339'
[yardstick.git] / yardstick / tests / unit / common / __init__.py