Merge remote-tracking branch 'origin/deleteApi' into deleteApi

# Conflicts:
#	indexer-core/src/main/java/org/opengroup/osdu/indexer/api/CleanupIndiciesApi.java

indexer-core/src/main/java/org/opengroup/osdu/indexer/api/CleanupIndiciesApi.java

@@ -31,7 +31,6 @@ import org.opengroup.osdu.core.common.model.indexer.RecordInfo;
 import org.opengroup.osdu.core.common.model.search.RecordChangedMessages;
 import org.opengroup.osdu.core.common.model.search.SearchServiceRole;
 import org.opengroup.osdu.core.common.model.storage.validation.ValidKind;
-import org.opengroup.osdu.core.common.model.storage.validation.ValidKind;
 import org.opengroup.osdu.core.common.search.ElasticIndexNameResolver;
 import org.opengroup.osdu.indexer.SwaggerDoc;
 import org.opengroup.osdu.indexer.logging.AuditLogger;
@@ -125,4 +124,4 @@ public class CleanupIndiciesApi {
       throw new AppException(HttpStatus.INTERNAL_SERVER_ERROR.value(), "Unknown error", "An unknown error has occurred.", e);
     }
   }
-}
\ No newline at end of file
+}