Merge "Fix doc typo that missed important words" into feature/zuulv3