Merge "Remove Cinder v1 tests"