Merge "Remove deprecated volume apis from v2 volumes client"