Merge branch 'stable-2.11' * stable-2.11: xdocs: Fix a race condition in generating the temporary file name Change-Id: Ifa6317db83cfd154e47a2ee99e5d3513e7f278a3