While upgrading a performance test site from 2.4.1 to master (2.5) I get the following error consistently during the upgrade process.

Debug info: ERROR: column "display" does not exist
LINE 1: SELECT id, name, display, intro, introformat FROM mdl_folder...
^
SELECT id, name, display, intro, introformat FROM mdl_folder WHERE id = $1
[array (
0 => '19',
)]
Error code: dmlreadexception
Stack trace:
line 426 of /lib/dml/moodle_database.php: dml_read_exception thrown
line 248 of /lib/dml/pgsql_native_moodle_database.php: call to moodle_database->query_end()
line 753 of /lib/dml/pgsql_native_moodle_database.php: call to pgsql_native_moodle_database->query_end()
line 1401 of /lib/dml/moodle_database.php: call to pgsql_native_moodle_database->get_records_sql()
line 1373 of /lib/dml/moodle_database.php: call to moodle_database->get_record_sql()
line 1352 of /lib/dml/moodle_database.php: call to moodle_database->get_record_select()
line 429 of /mod/folder/lib.php: call to moodle_database->get_record()
line 936 of /course/lib.php: call to folder_get_coursemodule_info()
line 1457 of /lib/modinfolib.php: call to get_array_of_activities()
line 1463 of /lib/db/upgrade.php: call to rebuild_course_cache()
line 1532 of /lib/upgradelib.php: call to xmldb_main_upgrade()
line 284 of /admin/index.php: call to upgrade_core()