Merge "Switch to lioadm for centos cinder"