DAOS-18726 test: Merging with current master for patch verification#17977

saurabhtandan wants to merge 2 commits intomasterdaos-stack/daos:masterfrom

standan/DAOS-18726_testdaos-stack/daos:standan/DAOS-18726_testCopy head branch name to clipboard