[REL-4161] some minor fixes and cleanup#520

blaqbern merged 1 commit intomainlaunchdarkly/ld-find-code-refs:mainfrom

cblackburn/REL-4161/follow-up-minor-fixeslaunchdarkly/ld-find-code-refs:cblackburn/REL-4161/follow-up-minor-fixesCopy head branch name to clipboard