deliverable: group attributes & elements

No content model changes, just list the attributes followed by
elements

Author: tomschr

src/docbuild/config/xml/data/portal-config-schema.rnc

@@ -1130,10 +1130,10 @@ ds.deliverable_subdeliverable =
     ds.remarks.attr?,
     ds.draft.attr?,
     ds.meta.attr?,
-    ds.subdir?,
     ds.gated.attr?,
+    ds.subdir?,
     ds.dc,
-    ds.format+,
+    ds.format,
     ds.subdeliverable+
   }
 }