bumping constituent repos at once

[grokspawn]

Replaces #3384 by syncing both constituent repos at one time.

Description of the change:

Motivation for the change:

Architectural changes:

Testing remarks:

Reviewer Checklist

• Implementation matches the proposed design, or proposal is updated to match implementation
• Sufficient unit test coverage
• Sufficient end-to-end test coverage
• Bug fixes are accompanied by regression test(s)
• e2e tests and flake fixes are accompanied evidence of flake testing, e.g. executing the test 100(0) times
• tech debt/todo is accompanied by issue link(s) in comments in the surrounding code
• Tests are comprehensible, e.g. Ginkgo DSL is being used appropriately
• Docs updated or added to /doc
• Commit messages sensible and descriptive
• Tests marked as [FLAKE] are truly flaky and have an issue
• Code is properly formatted

[perdasilva]

@grokspawn I've done goofed. I was in such a hurry to merge everything (why, I do not know), that I did it over the weekend here #3391 T_T without noticing your PR. Such a hurry that I took twice as long, when I could have just approved your PR :face-palm:. I'm really sorry. I'll try to make sure this doesn't happen again.