Merge "Fix documentation nits" into feature/zuulv3