Merge "Replace cinder detach volume with shade client."