Merge "Add test for cinder volume extend when volume has snapshot"