Fix problem with RFC2604 and RFC3025 that share drafts with other

non-obsolete RFCs
 - Legacy-Id: 2742

redesign/import-document-state.py

@@ -900,6 +900,12 @@ def get_or_create_rfc_document(rfc_number):
             if ids:
                 draft = ids[0]
 
+    if rfc_number in (2604, 3025):
+        # prevent merge for some botched RFCs that are obsoleted by
+        # another RFC coming from the same draft, in practice this is
+        # just these two, so we hardcode rather than querying for it
+        draft = None
+                
     if draft:
         name = draft.filename