Merge changes from topic '35521'
[yardstick.git] / api / resources / v1 / __init__.py