Fix derived query rewrite#19496

jainankitk merged 2 commits intoopensearch-project:mainopensearch-project/OpenSearch:mainfrom

harshavamsi:derived_fixharshavamsi/OpenSearch:derived_fixCopy head branch name to clipboard