Merge "Remove cinder clients api version 1"