Included changes from branch strip-down. Since Apache commons with the Http server are no longer available, all classes that deal with proxy have to be excluded of the build path and should be moved to the new artifact for proxy.