Merge "Fix some inconsistent indentation in docs" into feature/zuulv3