Merge 25.5 to develop

Author: labkey-teamcity

gradle.properties

@@ -92,7 +92,7 @@ angusMailVersion=2.0.3
 annotationsVersion=15.0
 
 antVersion=1.10.13
- 
+
 #Unifying version used by DISCVR and Premium
 apacheDirectoryVersion=2.1.7
 #Transitive dependency of Apache directory: 2.0.18 contains some regressions
@@ -158,7 +158,7 @@ googleAutoValueAnnotationsVersion=1.10.4
 googleErrorProneAnnotationsVersion=2.38.0
 googleHttpClientVersion=1.46.3
 googleOauthClientVersion=1.39.0
-googleProtocolBufVersion=3.25.5
+googleProtocolBufVersion=3.25.6
 
 # Cloud and SequenceAnalysis bring gson in as a transitive dependency.
 # We resolve to the later version here to keep things consistent