loading httpclient tests from Maven
Merge remote-tracking branch 'java/master'

Conflicts:
	pom.xml