Merge "Update manila config file permissions"