NEXUS-6701: UT

Conflicts:
	components/nexus-core/src/test/java/org/sonatype/nexus/proxy/storage/remote/httpclient/HttpClientRemoteStorageTest.java
NEXUS-6701: Ironing out API changes from master

as cherry-picking brought them in