Merge "Bring back (abandoned) support for Cinder/NFS"