Merge two reserved list entities (#616)

* Merge reserved list

* Replace INSTANCE with getInstance()

* Fix broken test

* Rebase on master

* Simplify class

db/src/main/resources/sql/schema/db-schema.sql.generated

@@ -462,8 +462,8 @@ create sequence history_id_sequence start 1 increment 1;
 
     create table "ReservedEntry" (
        revision_id int8 not null,
-        comment text,
         reservation_type int4 not null,
+        comment text,
         domain_label text not null,
         primary key (revision_id, domain_label)
     );