Refs #273: Reverse merged r1456619, since `contrib` may be needed for certain scenarios. Specifically, Olemis requested `contrib` be restored because the test cases for the th:XmlRpcPlugin were failing due to a dependency on `contrib/htpasswd.py`.

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