Merged Trac 1.0.2 and resolved merge conflicts. Many tests are failing.


git-svn-id: https://svn.apache.org/repos/asf/bloodhound/branches/trac-1.0.2-integration@1639823 13f79535-47bb-0310-9956-ffa450edef68