Merge "Use Cinder v2 by default in scenario tests"