Changes to support using httpclient 4.3.6 and httpcore 4.3.3 in
preparation for Mars M4 platform build.  See
https://bugs.eclipse.org/bugs/show_bug.cgi?id=448916

Change-Id: I3edf6a0ca751743ab4b8a73bbd54039c975bd4ae