Merge pull request #24081 from mhei/fix-buildbots-for-gensio