Merge "enable cinder v2 api for test_volumes_backup"