Merge "Add config options for cinder nfs backend"