Merge remote-tracking branch 'origin/develop' into fb_mcp_mvp

Author: labkey-adam

gradle.properties

@@ -44,7 +44,7 @@ buildFromSource=true
 
 # The default version for LabKey artifacts that are built or that we depend on.
 # override in an individual module's gradle.properties file as necessary 
-labkeyVersion=26.4-SNAPSHOT
+labkeyVersion=26.5-SNAPSHOT
 labkeyClientApiVersion=7.2.0
 
 # Version numbers for the various binary artifacts that are included when