Merge "Docs: reformat tenant config docs" into feature/zuulv3