Merge "Renaming Cinder admin client files"