Merge branch 'stable-2.9'

* stable-2.9:
  More detailed error message when failing to upload new change
  Keep old timestamps during data migration
  Describe change view preference in review UI documentation
  Add documentation with screenshots for the new review UIs
  Doc: Consistently refer to "Web UI" rather than "WebUI"

gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_77.java

@@ -138,7 +138,8 @@ public class Schema_77 extends SchemaVersion {
   private void migratePatchSetApprovals(ReviewDb db,
       LegacyLabelTypes labelTypes) throws SQLException {
     PreparedStatement stmt = ((JdbcSchema) db).getConnection().prepareStatement(
-        "UPDATE patch_set_approvals SET category_id = ? WHERE category_id = ?");
+        "UPDATE patch_set_approvals SET category_id = ?, granted=granted"
+        + " WHERE category_id = ?");
     try {
       for (LegacyLabelType type : labelTypes.getLegacyLabelTypes()) {
         stmt.setString(1, type.getName());