Merge discvr-19.3 to develop

Author: bbimber

.github/workflows/sync-repos.yml

@@ -4,6 +4,8 @@ on:
     - cron:  "15 */3 * * *"
 jobs:
   sync-release-branches:
+    # github.head_ref should only be set on forked repos, meaning this action should only run on the primary fork
+    if: github.head_ref == ''
     runs-on: ubuntu-latest
     steps:
       - name: "Sync Release Branches"
@@ -15,6 +17,7 @@ jobs:
           destination_branch_prefix: "discvr-"
           github_token: ${{ secrets.GITHUB_TOKEN }}
   sync-develop:
+    if: github.head_ref == ''
     runs-on: ubuntu-latest
     steps:
       - name: "Sync Develop Branch"

laboratory/src/org/labkey/laboratory/LaboratoryUserSchema.java

@@ -66,12 +66,12 @@ else if (LaboratorySchema.TABLE_SAMPLES.equalsIgnoreCase(name))
 
     private SimpleTable getSubjectsTable(String name, @NotNull TableInfo schematable, ContainerFilter cf)
     {
-        return new ContainerScopedTable(this, schematable, cf, "subjectname").init();
+        return new ContainerScopedTable<>(this, schematable, cf, "subjectname").init();
     }
 
     private TableInfo getContainerScopedTable(String name, @NotNull TableInfo schematable, ContainerFilter cf, String pkCol)
     {
-        return new ContainerScopedTable(this, schematable, cf, pkCol).init();
+        return new ContainerScopedTable<>(this, schematable, cf, pkCol).init();
     }
 
     private SimpleTable getDnaOligosTable(String name, @NotNull TableInfo schematable, ContainerFilter cf)