Merge "(bug 38281) Fix grammar in the UPGRADE file"