Merge "init_cinder() shouldn't always create DEFAULT_VOLUME_GROUP_NAME"