merged Https2HttpChannelHandler.java into AddressReplacingChannelHandler
fixed httpclient dependency scope
added changes to mappings test