Merge discvr 20.3#40

Merged

bbimber merged 3 commits intorelease20.7-SNAPSHOTfrom

fb_merge_discvr-20.3

Jul 10, 2020

Commits on Jul 9, 2020

Refactor laboratory.workbooks and container listener code to be more efficient
bbimber
committed

Commits on Jul 10, 2020