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