Merge branch 'cherry-pick-for-5' into release/0.26

Conflicts:
	gc-osm-datastore/pom.xml
	testing/gc-osm-test-datastore/pom.xml

gc-osm-datastore/pom.xml

@@ -21,7 +21,7 @@
     <dependency>
       <groupId>org.opengroup.osdu</groupId>
       <artifactId>os-osm-core</artifactId>
-      <version>0.25.0-rc5</version>
+      <version>0.26.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -110,4 +110,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>

testing/gc-osm-test-datastore/pom.xml

@@ -29,7 +29,7 @@
     <dependency>
       <groupId>org.opengroup.osdu</groupId>
       <artifactId>os-osm-test-core</artifactId>
-      <version>0.25.0-rc5</version>
+      <version>0.26.0</version>
     </dependency>
   </dependencies>
 
@@ -53,4 +53,4 @@
     </plugins>
   </build>
 
-</project>
\ No newline at end of file
+</project>