Merge "Use normal docs build jobs" into feature/zuulv3