Merge "[Cinder] Preparation for supporting Cinder replication testing"