Cumulative Hotfixes for Release-2.5.1#338

JohnKallies merged 3 commits intorelease-2.5.1wgu-opensource/osmt:release-2.5.1from

hotfix/patch-for-workspaceswgu-opensource/osmt:hotfix/patch-for-workspacesCopy head branch name to clipboard