Merge "Docs: reformat merger and executor config docs" into feature/zuulv3