Updates Apache httpclient version to avoid CVE-2014-3577
Adds String constructor to AbstractChannelImporter to allow plugins to work without recompiling ScannerType
Merge commit 'd560453f267a404059480decf2aa22788c157ba1' into HEAD