TRT-2764: Resolved conflicts from #3721 - Fix search bar not completing search#3818

not-stbenjam wants to merge 10 commits into

openshift:mainopenshift/sippy:mainfrom

not-stbenjam:trt-2764-resolvednot-stbenjam/sippy:trt-2764-resolvedCopy head branch name to clipboard