Add support for Apache HttpClient if available