ROX-13452: don't always clobber scoped ctx when non-postgres#3748

keyallis merged 1 commit intomasterstackrox/stackrox:masterfrom

rox-13452stackrox/stackrox:rox-13452Copy head branch name to clipboard