Fix project creation

Author: tvernum

server/src/main/java/org/elasticsearch/snapshots/RestoreService.java

@@ -486,6 +486,10 @@ private void startRestore(
         @FixForMultiProject
         final ProjectId projectId = ProjectId.DEFAULT;
         ProjectMetadata.Builder projectBuilder = metadataBuilder.getProject(projectId);
+        if (projectBuilder == null) {
+            projectBuilder = ProjectMetadata.builder(projectId);
+            metadataBuilder.put(projectBuilder);
+        }
         for (IndexId indexId : repositoryData.resolveIndices(requestedIndicesIncludingSystem).values()) {
             IndexMetadata snapshotIndexMetaData = repository.getSnapshotIndexMetaData(repositoryData, snapshotId, indexId);
             if (snapshotIndexMetaData.isSystem()) {

x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/storage/ReactiveStorageDeciderService.java

@@ -718,7 +718,12 @@ public void applyRouting(RoutingTable.Builder routing) {
             public void applyMetadata(Metadata.Builder metadataBuilder) {
                 @FixForMultiProject
                 final ProjectId projectId = ProjectId.DEFAULT;
-                applyProjectMetadata(metadataBuilder.getProject(projectId));
+                ProjectMetadata.Builder projectBuilder = metadataBuilder.getProject(projectId);
+                if (projectBuilder == null) {
+                    projectBuilder = ProjectMetadata.builder(projectId);
+                    metadataBuilder.put(projectBuilder);
+                }
+                applyProjectMetadata(projectBuilder);
             }
 
             public void applyProjectMetadata(ProjectMetadata.Builder projectBuilder) {