Merge "Re-add NFS backend for Glance"