Moved deprecated classes; fixed some deprecation warnings

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpcore/branches/4.3.x@1558081 13f79535-47bb-0310-9956-ffa450edef68