Merge "Move cinder tests into unversioned path - part2"