0.8dev: Reverse merge [1566948] in `trac` directory. Equivalent changes were made in the Trac core and we want to avoid merge conflicts.


git-svn-id: https://svn.apache.org/repos/asf/bloodhound/trunk@1567795 13f79535-47bb-0310-9956-ffa450edef68