Port r10219 2.7 test fix from stable
Port r10219 2.7 test fix from stable

git-svn-id: f68c6b3b1dcd5d00a2560c384475aaef3bc99487@10220 af82e41b-90c4-0310-8c96-b1721e28e2e2

moreati/trac-gitsvn,exocad/exotrac,exocad/exotrac,moreati/trac-gitsvn,moreati/trac-gitsvn,exocad/exotrac,moreati/trac-gitsvn,exocad/exotrac