Merge "Rename patch-id to file-id in the REST API documentation"